siluzan-tso-cli 1.1.22-beta.10 → 1.1.22-beta.11

package/README.md

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

package/dist/index.js

@@ -4623,7 +4623,10 @@ function buildOutlineHints(section) {
     hints.push(...GOOGLE_ANALYSIS_RATE_NORMALIZED_OUTLINE_HINTS);
   }
   if (section === "campaigns") {
-    hints.push(...GOOGLE_ANALYSIS_CAMPAIGNS_OUTLINE_BUDGET_HINTS);
+    hints.push(
+      ...GOOGLE_ANALYSIS_CAMPAIGNS_OUTLINE_BUDGET_HINTS,
+      ...GOOGLE_ANALYSIS_CAMPAIGNS_COMPETITIVE_METRICS_HINTS
+    );
   }
   const zhHints = GOOGLE_ANALYSIS_ZH_FIELD_HINTS_BY_SECTION[section];
   if (zhHints) hints.push(...zhHints);
@@ -4732,7 +4735,7 @@ async function writeGoogleAnalysisSnapshot(params) {
     agentHint: OUTLINE_AGENT_HINT
   };
 }
-var LEGACY_MANIFEST_FILE, CLI_PACKAGE2, SCHEMA_VERSION2, DEFAULT_FIELD_GUIDE2, GOOGLE_ANALYSIS_CAMPAIGNS_OUTLINE_BUDGET_HINTS, RATE_BEARING_SECTIONS, GOOGLE_ANALYSIS_RATE_NORMALIZED_OUTLINE_HINTS, GOOGLE_ANALYSIS_ZH_FIELD_HINTS_BY_SECTION;
+var LEGACY_MANIFEST_FILE, CLI_PACKAGE2, SCHEMA_VERSION2, DEFAULT_FIELD_GUIDE2, GOOGLE_ANALYSIS_CAMPAIGNS_OUTLINE_BUDGET_HINTS, GOOGLE_ANALYSIS_CAMPAIGNS_COMPETITIVE_METRICS_HINTS, RATE_BEARING_SECTIONS, GOOGLE_ANALYSIS_RATE_NORMALIZED_OUTLINE_HINTS, GOOGLE_ANALYSIS_ZH_FIELD_HINTS_BY_SECTION;
 var init_google_analysis = __esm({
   "src/utils/snapshot/google-analysis.ts"() {
     "use strict";
@@ -4749,6 +4752,10 @@ var init_google_analysis = __esm({
       "// \u91D1\u989D\uFF1A`campaigns[].budgetAmountYuan` / `campaignTargetCpaYuan` / `maximizeConversionsTargetCpaYuan` \u5747\u4E3A**\u5143**\uFF08CLI \u51FA\u53E3\u7EDF\u4E00\uFF09\uFF1B\u540C\u884C `spend` / `averageCpc` / `costPerConversion` \u4E5F\u662F\u5143\u3002",
       "// \u65E7\u5B57\u6BB5 `budgetAmount`\uFF08\u5206\uFF09/ `*Micros`\uFF08\u5FAE\u5143\uFF09\u5DF2\u4E0D\u518D\u843D\u76D8\uFF0C**\u7981\u6B62**\u518D\u505A \xF7100 / \xF71_000_000 \u6362\u7B97\u3002"
     ];
+    GOOGLE_ANALYSIS_CAMPAIGNS_COMPETITIVE_METRICS_HINTS = [
+      "// \u7ADE\u4E89\u6307\u6807\uFF1A`campaigns[].competitiveMetrics` \u4E3A Google \u539F\u751F **0~1 \u5C0F\u6570**\uFF08\u5982 `0.0999` = 9.99%\uFF09\uFF0C\u542B Top/AbsoluteTop/Content/ClickShare \u7B49 15 \u9879\uFF1B\u65E0 GAQL \u7ADE\u4E89\u6570\u636E\u65F6\u4E3A `null`\u3002",
+      "// \u884C\u9876 `searchImpressionShare` / `searchBudgetLostImpressionShare` / `searchRankLostImpressionShare` \u4ECD\u4E3A **0~100 \u767E\u5206\u6570**\uFF08\u4EC5 3 \u9879\uFF09\uFF1B**\u7981\u6B62**\u4E0E `competitiveMetrics.*` \u76F8\u52A0\u6216\u6DF7\u7B97\u3002"
+    ];
     RATE_BEARING_SECTIONS = /* @__PURE__ */ new Set([
       "overview",
       "keywords",
@@ -116564,6 +116571,62 @@ init_auth();
 init_cli_json_snapshot();
 init_cli_table();
 
+// src/commands/keyword-account-match.ts
+init_auth();
+function normalizeKeywordForAccountMatch(raw) {
+  return unwrapKeywordDisplayTextForEdit(raw.trim()).toLowerCase();
+}
+function extractKeywordTextFromManagementRow(row) {
+  const kt = row["keywordText"];
+  if (Array.isArray(kt) && kt.length > 0 && typeof kt[0] === "string") {
+    return kt[0];
+  }
+  const t = row["text"];
+  if (typeof t === "string") return t;
+  const kw = row["keyword"];
+  if (typeof kw === "string") return kw;
+  return "";
+}
+async function fetchAccountPositiveKeywordNormSet(config, googleApiUrl, accountId, opts) {
+  const lookback = opts?.lookbackDays ?? 3650;
+  const params = new URLSearchParams();
+  params.set("startDate", toGoogleDate(void 0, -lookback));
+  params.set("endDate", toGoogleDate(void 0, 0));
+  const url = `${googleApiUrl}/keywordmanagement/v2/list/${accountId}?${params}`;
+  const data = await apiFetch2(
+    url,
+    config,
+    {},
+    opts?.verbose
+  );
+  const rawItems = data.data ?? [];
+  const seenIds = /* @__PURE__ */ new Set();
+  const normSet = /* @__PURE__ */ new Set();
+  for (const row of rawItems) {
+    const id = row["id"];
+    if (id !== void 0) {
+      if (seenIds.has(id)) continue;
+      seenIds.add(id);
+    }
+    const text = extractKeywordTextFromManagementRow(row);
+    if (!text) continue;
+    const norm = normalizeKeywordForAccountMatch(text);
+    if (norm) normSet.add(norm);
+  }
+  return normSet;
+}
+function keywordAlreadyInAccountFlag(recommendKeyword, accountNormSet) {
+  const norm = normalizeKeywordForAccountMatch(recommendKeyword ?? "");
+  if (!norm) return 0;
+  return accountNormSet.has(norm) ? 1 : 0;
+}
+function annotateKeywordSuggestWithAccountPresence(items, accountNormSet) {
+  return items.map((item) => {
+    const flag = keywordAlreadyInAccountFlag(item.keyword, accountNormSet);
+    return { ...item, alreadyInAccount: flag };
+  });
+}
+
 // src/commands/keyword-geo.ts
 function parseGeoTargetConstantIds(raw) {
   if (!raw?.trim()) return [];
@@ -116828,6 +116891,27 @@ async function runKeywordSuggest(opts) {
       return !excludes.some((exc) => kw.includes(exc));
     });
   }
+  if (accountId) {
+    try {
+      const accountNormSet = await fetchAccountPositiveKeywordNormSet(
+        config,
+        googleApiUrl,
+        accountId,
+        { verbose: opts.verbose }
+      );
+      items = annotateKeywordSuggestWithAccountPresence(items, accountNormSet);
+      if (opts.verbose) {
+        const matched = items.filter((r) => r.alreadyInAccount === 1).length;
+        console.error(
+          `  [keyword] \u8D26\u6237\u8BCD\u5E93 ${accountNormSet.size} \u4E2A\u8BCD\u5E72\uFF1B\u63A8\u8350 ${items.length} \u6761\uFF0C\u5176\u4E2D\u5DF2\u5728\u8D26\u6237 ${matched} \u6761`
+        );
+      }
+    } catch (err) {
+      console.error(
+        `  [keyword] \u8B66\u544A\uFF1A\u62C9\u53D6\u8D26\u6237\u5173\u952E\u8BCD\u5931\u8D25\uFF0C\u8DF3\u8FC7 alreadyInAccount \u6807\u6CE8\uFF1A${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  }
   const n = items.length;
   const kwPayload = buildKeywordSuggestJsonPayload(items, { bidAmountCurrency });
   const displayItems = kwPayload.items;
@@ -116849,6 +116933,7 @@ async function runKeywordSuggest(opts) {
   const cur = bidAmountCurrency;
   const cols = [
     { key: "keyword", header: "\u5173\u952E\u8BCD" },
+    ...accountId ? [{ key: "alreadyInAccount", header: "\u5DF2\u5728\u8D26\u6237\u4E2D" }] : [],
     { key: "montlySearch", header: "\u6708\u5747\u641C\u7D22" },
     { key: "cpcMain", header: `\u5E73\u5747CPC(${cur})` },
     { key: "bidRangeMain", header: `\u9875\u9996\u51FA\u4EF7(${cur})` },
@@ -116862,6 +116947,9 @@ async function runKeywordSuggest(opts) {
     const competitionDisplay = item.competitionV2 ?? (item.competition != null ? item.competition.toFixed(2) : "\u2014");
     return {
       keyword: item.keyword ?? "",
+      ...accountId ? {
+        alreadyInAccount: item.alreadyInAccount === 1 ? "1" : item.alreadyInAccount === 0 ? "0" : "\u2014"
+      } : {},
       montlySearch: String(item.montlySearch ?? "\u2014"),
       cpcMain,
       bidRangeMain,

package/dist/skill/_meta.json

@@ -1,5 +1,5 @@
 {
   "slug": "siluzan-tso",
-  "version": "1.1.22-beta.10",
-  "publishedAt": 1779948041465
+  "version": "1.1.22-beta.11",
+  "publishedAt": 1779953485150
 }

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

@@ -215,7 +215,31 @@ CLI 在落盘前为以下维度自动补「中文译名字段」（**原英文
 
 `campaigns[]` 每行额外包含：`conversionsValue`、`conversionsValuePerCost`（`spend ≤ 0` 时为 0）、`campaignTargetCpaYuan`、`maximizeConversionsTargetCpaYuan`、`manualCpcEnhancedCpcEnabled`、`percentCpcEnhancedCpcEnabled`。所有金额字段（`*Yuan` 后缀）已统一为元，可直接展示，无需换算。
 
-日预算字段为 `budgetAmountYuan`（元），脚本可直接 `row.get("budgetAmountYuan")`；网关原始 `budgetAmount`（分）已不再落盘。
+日预算字段为 `budgetAmountYuan`（元），脚本可直接 `row.budgetAmountYuan`；网关原始 `budgetAmount`（分）已不再落盘。
+
+#### 竞争指标 `competitiveMetrics`（推荐）
+
+网关 `CampaignSectionData` 每系列可带嵌套对象 `competitiveMetrics`（对齐 Sammamish `ReportCompetitiveMetrics`），**值为 Google 原生 0~1 小数**（如 `0.0999` 表示约 9.99%）。常见字段：
+
+| 字段 | 含义 |
+|------|------|
+| `searchImpressionShare` | 搜索展示份额 |
+| `searchTopImpressionShare` | 搜索页首展示份额 |
+| `searchAbsoluteTopImpressionShare` | 搜索绝对页首展示份额 |
+| `searchBudgetLostImpressionShare` | 因预算丢失的搜索展示份额 |
+| `searchRankLostImpressionShare` | 因排名丢失的搜索展示份额 |
+| `searchBudgetLostTopImpressionShare` / `searchRankLostTopImpressionShare` | 页首维度预算/排名丢失 |
+| `searchBudgetLostAbsoluteTopImpressionShare` / `searchRankLostAbsoluteTopImpressionShare` | 绝对页首维度预算/排名丢失 |
+| `searchExactMatchImpressionShare` | 完全匹配展示份额 |
+| `contentImpressionShare` / `contentBudgetLostImpressionShare` / `contentRankLostImpressionShare` | 展示网络份额与丢失 |
+| `searchClickShare` | 搜索点击份额 |
+| `relativeCtr` | 相对点击率 |
+
+无竞争数据时 `competitiveMetrics` 为 `null`（或缺省）。写 Excel「x%」列：`(v * 100).toFixed(2) + '%'`。
+
+#### 行顶 legacy 份额（勿与 `competitiveMetrics` 混用）
+
+同一行仍保留 3 个行顶字段 `searchImpressionShare`、`searchBudgetLostImpressionShare`、`searchRankLostImpressionShare`，口径为 **0~100 百分数**（网关已 ×100）。分析 Top/AbsoluteTop/Content/ClickShare 等请用 `competitiveMetrics`；仅用行顶 3 项时按百分数理解，**禁止**与 `competitiveMetrics.*` 相加。
 
 ### campaign-hour 字段
 

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

@@ -201,10 +201,10 @@ siluzan-tso keyword -k "<必填，逗号分隔多词>" [-a <mediaCustomerId>] [-
 siluzan-tso keyword geo-list [--country-code <codes>] [--name-contains <text>] [--json-out ./snap] [--json-out <dir>]
 ```
 
-`-a`：走 `keywordrecommendation/recommend/{id}/google`；先 `list-accounts -m Google -k <id>` 确认账户与 **`currencyCode`**；出价金额字段为 `averageCpc` / `lowTopOfPageBid` / `highTopOfPageBid`（**账户币种「元」**，非汇率换算）。
+`-a`：走 `keywordrecommendation/recommend/{id}/google`；先 `list-accounts -m Google -k <id>` 确认账户与 **`currencyCode`**；出价金额字段为 `averageCpc` / `lowTopOfPageBid` / `highTopOfPageBid`（**账户币种「元」**，非汇率换算）。CLI 会再调 `keywordmanagement/v2/list`（约 10 年区间）拉账户正向词，对每条推荐写 **`alreadyInAccount`**：`1`=词干已存在，`0`=否（匹配时忽略 broad/phrase/exact 的 `""`/`[]` 包裹，大小写不敏感）。该列表为报表口径，非 Google 后台 criterion 全量；区间内从未出报表行的词可能标 `0`。
 
 `--google-only`：只调 Google 推荐主接口（有 `-a` 为账户接口，无 `-a` 为 `keywordidea/google`），不叠加 `--url` 的网址拓词；**分支 B（仅 Google）必加**。
 
-**返回字段**（与后端 `Samm.Core.Service.KeywordRecommendation` 对齐）：根级与每条 **`bidAmountCurrency`**（无账户=`USD`；有账户=`list-accounts` 的 `currencyCode`）；`averageCpc` / `lowTopOfPageBid` / `highTopOfPageBid`（微元 ÷1,000,000，**与 `bidAmountCurrency` 一致**）。另有 `keyword` / `montlySearch` / `competition` / `competitionV2` / `source` 等。
+**返回字段**（与后端 `Samm.Core.Service.KeywordRecommendation` 对齐）：根级与每条 **`bidAmountCurrency`**（无账户=`USD`；有账户=`list-accounts` 的 `currencyCode`）；`averageCpc` / `lowTopOfPageBid` / `highTopOfPageBid`（微元 ÷1,000,000，**与 `bidAmountCurrency` 一致**）。另有 `keyword` / `montlySearch` / `monthlySearchVolumes` / `competition` / `competitionV2` / `source` 等；**有 `-a` 时**每条多 **`alreadyInAccount`**（`0` | `1`）。
 
 与只读账户关键词列表、否词 CRUD 的对照仍归 **`references/google-ads/google-ads.md`** 中 `ad keywords` / `ad keyword-*` 各节。

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