siluzan-tso-cli 1.1.18-beta.6 → 1.1.18-beta.7

package/README.md

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

package/dist/index.js

@@ -2412,23 +2412,28 @@ function createVersionNotifier(opts) {
     mergeWriteConfig,
     readConfigRaw
   } = opts;
-  const KEY_LAST_CHECK = `${cachePrefix}LastVersionCheck`;
   const KEY_LATEST_STABLE = `${cachePrefix}LatestStable`;
   const KEY_LATEST_BETA = `${cachePrefix}LatestBeta`;
   const KEY_MIN_STABLE = `${cachePrefix}MinRequiredStable`;
   const KEY_MIN_BETA = `${cachePrefix}MinRequiredBeta`;
   const KEY_LAST_NOTIFIED = `${cachePrefix}LastNotified`;
+  const KEY_FETCH_AT_MAIN = `${cachePrefix}VersionFetchAtMain`;
+  const KEY_FETCH_AT_MIN = `${cachePrefix}VersionFetchAtMin`;
   const HOURS_24 = 24 * 60 * 60 * 1e3;
-  async function fetchVersionByTag(tag, cacheKey, cfg) {
-    const lastCheck = cfg[KEY_LAST_CHECK];
-    if (typeof lastCheck === "string" && cacheKey in cfg) {
-      const lastMs = new Date(lastCheck).getTime();
-      if (Date.now() - lastMs < HOURS_24) {
+  const TTL_MAIN_TAG_MS = 60 * 60 * 1e3;
+  const TTL_MIN_REQUIRED_MS = HOURS_24;
+  async function fetchVersionByTag(tag, cacheKey, fetchAtKey, cfg, maxAgeMs) {
+    const lastAt = cfg[fetchAtKey];
+    if (typeof lastAt === "string" && cacheKey in cfg) {
+      const lastMs = new Date(lastAt).getTime();
+      if (Date.now() - lastMs < maxAgeMs) {
         const v = cfg[cacheKey];
-        return typeof v === "string" && v ? v : null;
+        const sv = typeof v === "string" && v ? v : null;
+        return { version: sv, hitNetwork: false };
       }
     }
-    return fetchNpmVersion(pkgName, tag);
+    const version = await fetchNpmVersion(pkgName, tag);
+    return { version, hitNetwork: true };
   }
   async function notifyIfOutdated2() {
     try {
@@ -2439,15 +2444,20 @@ function createVersionNotifier(opts) {
       const minCacheKey = isBeta ? KEY_MIN_BETA : KEY_MIN_STABLE;
       const minTag = npmMinRequiredTagForBuildEnv(isBeta ? "test" : "production");
       const cfg = readConfigRaw();
-      const [latest, minRequired] = await Promise.all([
-        fetchVersionByTag(tag, latestCacheKey, cfg),
-        fetchVersionByTag(minTag, minCacheKey, cfg)
+      const [mainRes, minRes] = await Promise.all([
+        fetchVersionByTag(tag, latestCacheKey, KEY_FETCH_AT_MAIN, cfg, TTL_MAIN_TAG_MS),
+        fetchVersionByTag(minTag, minCacheKey, KEY_FETCH_AT_MIN, cfg, TTL_MIN_REQUIRED_MS)
       ]);
-      await mergeWriteConfig({
-        [KEY_LAST_CHECK]: (/* @__PURE__ */ new Date()).toISOString(),
+      const latest = mainRes.version;
+      const minRequired = minRes.version;
+      const nowIso = (/* @__PURE__ */ new Date()).toISOString();
+      const cacheUpdates = {
         [latestCacheKey]: latest ?? "",
         [minCacheKey]: minRequired ?? ""
-      });
+      };
+      if (mainRes.hitNetwork) cacheUpdates[KEY_FETCH_AT_MAIN] = nowIso;
+      if (minRes.hitNetwork) cacheUpdates[KEY_FETCH_AT_MIN] = nowIso;
+      await mergeWriteConfig(cacheUpdates);
       const lastNotified = typeof cfg[KEY_LAST_NOTIFIED] === "string" ? new Date(cfg[KEY_LAST_NOTIFIED]).getTime() : 0;
       if (Date.now() - lastNotified < HOURS_24) return;
       const tagLabel = isBeta ? "\uFF08\u6D4B\u8BD5\u7248\uFF09" : "\uFF08\u6B63\u5F0F\u7248\uFF09";
@@ -5965,6 +5975,11 @@ async function fetchJson(config, pathWithQuery, verbose) {
 function assertNever(x, ctx) {
   throw new Error(`${ctx}\uFF1A\u672A\u5904\u7406\u7684\u5206\u652F ${String(x)}`);
 }
+function rowsFromAccountDailyReportsEnvelope(raw, mediaCustomerId) {
+  const block = raw.accounts?.[mediaCustomerId];
+  const list = block?.data;
+  return Array.isArray(list) ? list : [];
+}
 async function fetchGoogleAnalysisSectionJson(config, fullPath, verbose, name) {
   switch (name) {
     case "overview":
@@ -5995,8 +6010,6 @@ async function fetchGoogleAnalysisSectionJson(config, fullPath, verbose, name) {
       return fetchJson(config, fullPath, verbose);
     case "conversion-actions":
       return fetchJson(config, fullPath, verbose);
-    case "daily-metrics":
-      return fetchJson(config, fullPath, verbose);
     case "gold-account":
       return fetchJson(config, fullPath, verbose);
     case "ads-index":
@@ -6049,6 +6062,18 @@ async function fetchSectionPayload(def, opts, config, id) {
     const merged = { images, videos };
     return stripLegacyGoogleFieldsIfV2Present(merged);
   }
+  if (def.name === "daily-metrics") {
+    const { startDate, endDate } = resolveDateRange2(opts.start, opts.end);
+    const params = new URLSearchParams({
+      mediaCustomerIds: id,
+      startDate: `${startDate}T00:00:00+08:00`,
+      endDate: `${endDate}T23:59:59+08:00`
+    });
+    const url = `${config.apiBaseUrl}/report/media-account/google/account-daily-reports?${params.toString()}`;
+    const raw = await apiFetch2(url, config, {}, !!opts.verbose);
+    const rows = rowsFromAccountDailyReportsEnvelope(raw, id);
+    return stripLegacyGoogleFieldsIfV2Present(rows);
+  }
   const sectionPath = def.path(id);
   const query = buildSearchParams(def, opts.start, opts.end, extras);
   const data = await fetchGoogleAnalysisSectionJson(
@@ -6457,9 +6482,10 @@ var init_google_analysis2 = __esm({
       },
       {
         name: "daily-metrics",
-        description: "\u6309\u65E5\u6307\u6807\u66F2\u7EBF reports\uFF08\u542B\u8F6C\u5316\u6210\u672C\u7B49\uFF09",
+        description: "\u6309\u65E5\u6307\u6807\uFF08\u4E3B\u5E73\u53F0 /report/media-account/google/account-daily-reports\uFF0C\u542B\u641C\u7D22\u4EFD\u989D\u7B49\uFF09",
         dateMode: "range",
-        path: (id) => `/reporting/media-account/${id}/reports`
+        /** 仅用于 manifest endpointHint；实际请求走 fetchSectionPayload 专用分支（apiBaseUrl + 东八区起止时刻） */
+        path: () => "/report/media-account/google/account-daily-reports"
       },
       {
         name: "gold-account",
@@ -14368,6 +14394,42 @@ init_auth();
 init_cli_json_snapshot();
 init_strip_legacy_google_fields();
 init_cli_table();
+function unwrapKeywordDisplayTextForEdit(raw) {
+  const t = raw.trim();
+  if (t.length >= 2 && t.startsWith('"') && t.endsWith('"')) {
+    return t.slice(1, -1);
+  }
+  if (t.length >= 2 && t.startsWith("[") && t.endsWith("]")) {
+    return t.slice(1, -1);
+  }
+  return t;
+}
+function formatKeywordTextForMatchType(rawCoreOrDisplay, matchType) {
+  const core = unwrapKeywordDisplayTextForEdit(rawCoreOrDisplay);
+  switch (matchType) {
+    case "Broad":
+      return core;
+    case "Phrase":
+      return `"${core}"`;
+    case "Exact":
+      return `[${core}]`;
+    default: {
+      const _x = matchType;
+      return _x;
+    }
+  }
+}
+function firstKeywordTextFromRecord(k) {
+  const kt = k["keywordText"];
+  if (Array.isArray(kt) && kt.length > 0 && typeof kt[0] === "string") {
+    return kt[0];
+  }
+  const t = k["text"];
+  if (typeof t === "string") {
+    return t;
+  }
+  return "";
+}
 async function runAdKeywords(opts) {
   const config = loadConfig(opts.token);
   const googleApiUrl = requireGoogleApi(config);
@@ -14559,8 +14621,17 @@ async function runAdKeywordEdit(opts) {
     process.exit(1);
   }
   const body = { ...keyword };
-  if (opts.text !== void 0) body["keywordText"] = [opts.text];
-  if (opts.matchType !== void 0) body["matchTypeV2"] = opts.matchType;
+  if (opts.matchType !== void 0) {
+    const base = opts.text !== void 0 ? opts.text : firstKeywordTextFromRecord(keyword);
+    if (!String(base).trim()) {
+      console.error("\n\u274C \u65E0\u6CD5\u89E3\u6790\u5F53\u524D\u5173\u952E\u8BCD\u6587\u6848\uFF0C\u8BF7\u540C\u65F6\u4F20 --text <\u8BCD\u5E72>\n");
+      process.exit(1);
+    }
+    body["keywordText"] = [formatKeywordTextForMatchType(base, opts.matchType)];
+    body["matchTypeV2"] = opts.matchType;
+  } else if (opts.text !== void 0) {
+    body["keywordText"] = [opts.text];
+  }
   if (opts.maxCpc !== void 0) body["maxCPC"] = opts.maxCpc;
   if (opts.finalUrl !== void 0) body["finalURL"] = opts.finalUrl;
   const url = `${googleApiUrl}/keywordmanagement/Keyword/${opts.account}/batch`;
@@ -14607,8 +14678,17 @@ async function runAdNegativeKeywordEdit(opts) {
     process.exit(1);
   }
   const body = { ...keyword };
-  if (opts.text !== void 0) body["keywordText"] = [opts.text];
-  if (opts.matchType !== void 0) body["matchTypeV2"] = opts.matchType;
+  if (opts.matchType !== void 0) {
+    const base = opts.text !== void 0 ? opts.text : firstKeywordTextFromRecord(keyword);
+    if (!String(base).trim()) {
+      console.error("\n\u274C \u65E0\u6CD5\u89E3\u6790\u5F53\u524D\u5426\u5B9A\u5173\u952E\u8BCD\u6587\u6848\uFF0C\u8BF7\u540C\u65F6\u4F20 --text <\u8BCD\u5E72>\n");
+      process.exit(1);
+    }
+    body["keywordText"] = [formatKeywordTextForMatchType(base, opts.matchType)];
+    body["matchTypeV2"] = opts.matchType;
+  } else if (opts.text !== void 0) {
+    body["keywordText"] = [opts.text];
+  }
   const url = `${googleApiUrl}/negativekeywordmanagement/negativekeyword/${opts.account}/${opts.id}`;
   try {
     await apiFetch2(url, config, { method: "PUT", body: JSON.stringify(body) }, opts.verbose);
@@ -15910,7 +15990,10 @@ function register20(program2) {
       });
     }
   );
-  adCmd.command("keyword-edit").description("\u7F16\u8F91\u641C\u7D22\u5173\u952E\u8BCD\uFF08\u6570\u7EC4 body\uFF0C\u5148 list \u518D\u5408\u5E76\uFF09").requiredOption("-a, --account <id>", "Google \u8D26\u6237 mediaCustomerId").requiredOption("--id <keywordId>", "\u5173\u952E\u8BCD ID\uFF08\u6765\u81EA ad keywords --json \u2192 id\uFF09").option("--text <text>", "\u65B0\u5173\u952E\u8BCD\u6587\u672C\uFF08\u5199\u5165 keywordText \u6570\u7EC4\uFF09").option("--match-type <type>", "\u65B0\u5339\u914D\u7C7B\u578B\uFF1ABroad | Phrase | Exact\uFF08\u5199\u5165 matchTypeV2\uFF09").option(
+  adCmd.command("keyword-edit").description("\u7F16\u8F91\u641C\u7D22\u5173\u952E\u8BCD\uFF08\u6570\u7EC4 body\uFF0C\u5148 list \u518D\u5408\u5E76\uFF09").requiredOption("-a, --account <id>", "Google \u8D26\u6237 mediaCustomerId").requiredOption("--id <keywordId>", "\u5173\u952E\u8BCD ID\uFF08\u6765\u81EA ad keywords --json \u2192 id\uFF09").option("--text <text>", "\u65B0\u5173\u952E\u8BCD\u6587\u672C\uFF08\u5199\u5165 keywordText \u6570\u7EC4\uFF09").option(
+    "--match-type <type>",
+    '\u65B0\u5339\u914D\u7C7B\u578B\uFF1ABroad | Phrase | Exact\uFF08\u5199 matchTypeV2\uFF0C\u5E76\u9ED8\u8BA4\u540C\u6B65\u6539\u5199 keywordText \u4E3A\u8BCD\u5E72/"\u8BCD"/[\u8BCD] \u4EE5\u7B26\u5408\u7F51\u5173\u63A8\u65AD\uFF09'
+  ).option(
     "--max-cpc <n>",
     "\u6700\u9AD8\u6BCF\u6B21\u70B9\u51FB\u8D39\u7528 maxCPC\uFF0C\u4E3B\u5E01\u79CD\u91D1\u989D\uFF08\u5982 5 \u8868\u793A \xA55\uFF1B\u26A0\uFE0F \u8FD9\u4E2A\u5B57\u6BB5\u540E\u7AEF\u5355\u4F4D\u5C31\u662F\u300C\u4E3B\u5E01\u79CD\u5143\u300D\uFF0CCLI \u76F4\u63A5\u900F\u4F20\u4E0D\u505A \xD7100\uFF0C\u4E0E budget / \u7EC4 maxCPCAmount \u4E0D\u540C\uFF1B0 \u8868\u793A\u6309\u5E73\u53F0/\u8BA1\u5212\u9ED8\u8BA4\uFF09"
   ).option("--final-url <url>", "\u5173\u952E\u8BCD\u7EA7\u6700\u7EC8\u5230\u8FBE\u7F51\u5740 finalURL").option("--start <date>", "\u5217\u8868\u67E5\u8BE2\u8D77\u59CB\u65E5\u671F YYYY-MM-DD").option("--end <date>", "\u5217\u8868\u67E5\u8BE2\u7ED3\u675F\u65E5\u671F YYYY-MM-DD").option("-t, --token <token>", "Auth Token").option("--verbose", "\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F", false).action(
@@ -15941,7 +16024,10 @@ function register20(program2) {
       });
     }
   );
-  adCmd.command("keyword-negative-edit").description("\u7F16\u8F91\u5426\u5B9A\u5173\u952E\u8BCD\uFF08\u6587\u672C\u6216\u5339\u914D\u7C7B\u578B\uFF0C\u81F3\u5C11\u4F20\u4E00\u4E2A\u4FEE\u6539\u9879\uFF09").requiredOption("-a, --account <id>", "Google \u8D26\u6237 mediaCustomerId").requiredOption("--id <keywordId>", "\u5426\u5B9A\u5173\u952E\u8BCD ID\uFF08\u6765\u81EA ad keywords --negative --json \u2192 id\uFF09").option("--text <text>", "\u65B0\u5173\u952E\u8BCD\u6587\u672C").option("--match-type <type>", "\u65B0\u5339\u914D\u7C7B\u578B\uFF1ABroad | Phrase | Exact").option("--start <date>", "\u5217\u8868\u67E5\u8BE2\u8D77\u59CB\u65E5\u671F YYYY-MM-DD").option("--end <date>", "\u5217\u8868\u67E5\u8BE2\u7ED3\u675F\u65E5\u671F YYYY-MM-DD").option("-t, --token <token>", "Auth Token").option("--verbose", "\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F", false).action(
+  adCmd.command("keyword-negative-edit").description("\u7F16\u8F91\u5426\u5B9A\u5173\u952E\u8BCD\uFF08\u6587\u672C\u6216\u5339\u914D\u7C7B\u578B\uFF0C\u81F3\u5C11\u4F20\u4E00\u4E2A\u4FEE\u6539\u9879\uFF09").requiredOption("-a, --account <id>", "Google \u8D26\u6237 mediaCustomerId").requiredOption("--id <keywordId>", "\u5426\u5B9A\u5173\u952E\u8BCD ID\uFF08\u6765\u81EA ad keywords --negative --json \u2192 id\uFF09").option("--text <text>", "\u65B0\u5173\u952E\u8BCD\u6587\u672C").option(
+    "--match-type <type>",
+    '\u65B0\u5339\u914D\u7C7B\u578B\uFF1ABroad | Phrase | Exact\uFF08\u5199 matchTypeV2\uFF0C\u5E76\u9ED8\u8BA4\u540C\u6B65\u6539\u5199 keywordText \u4E3A\u8BCD\u5E72/"\u8BCD"/[\u8BCD]\uFF09'
+  ).option("--start <date>", "\u5217\u8868\u67E5\u8BE2\u8D77\u59CB\u65E5\u671F YYYY-MM-DD").option("--end <date>", "\u5217\u8868\u67E5\u8BE2\u7ED3\u675F\u65E5\u671F YYYY-MM-DD").option("-t, --token <token>", "Auth Token").option("--verbose", "\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F", false).action(
     async (opts) => {
       if (opts.matchType && !["Broad", "Phrase", "Exact"].includes(opts.matchType)) {
         console.error("\n\u274C --match-type \u53EA\u63A5\u53D7 Broad | Phrase | Exact\n");

package/dist/skill/_meta.json

@@ -1,5 +1,5 @@
 {
   "slug": "siluzan-tso",
-  "version": "1.1.18-beta.6",
-  "publishedAt": 1778324246028
+  "version": "1.1.18-beta.7",
+  "publishedAt": 1778465751958
 }

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

@@ -33,10 +33,10 @@
 2. 确定报告维度（默认含：执行摘要、每日趋势、月度汇总、系列表现、设备分布、地域分布、关键词表现、优化建议），详见 `report-templates/README.md`。
 3. **拉数**：使用 `google-analysis … --json-out <dir>`（Google）或对应 `report <media>-*` 命令落盘。
 4. **编写并执行代码**从磁盘读取 `manifest-<accountId>.json` 与各 `<section>-<accountId>.json` 来完成筛选、聚合、排序等计算；**禁止**用 `Read` 看 JSON 后在对话里心算或手填报告数字。
-   - **写脚本前先读 `<section>-<accountId>.outline.txt`**（与 JSON 同 stem 的纯文本，最后一行是 TS 式类型字面量）了解字段结构；它体积只有几百字节、不含数据，比直接 `Read` 整个 `*.json`（动辄几 MB / 几万行）省**两到三个数量级**的上下文。**注意是 `.outline.txt` 不是 `.outline.json`**，不要 `require()`，用 `fs.readFileSync(outlineFile,'utf8')` 读最后一行即可。
-   - 真实数据始终从 `<section>-<accountId>.json` 由脚本读，**不要**把 outline 当作业务数据贴给用户。
-5. **由代码写出最终文件**（HTML/Excel/PDF/PPT/Markdown 等）。**禁止**在报告脚本中以源码字面量写死应从 JSON 读取的业务数据（消耗金额、系列名、日期区间等）。允许的常量仅限：快照目录路径、JSON 字段键名、版式/结构占位。
-6. **报告首行**须标注：`统计区间：YYYY-MM-DD ~ YYYY-MM-DD（货币：XXX）`，由脚本从 JSON 拼接写入，不得手写常量冒充。
+   - **写脚本前先读 `<section>-<accountId>.outline.txt`**（与 JSON 同 stem 的纯文本，最后一行是 TS 式类型字面量）了解字段结构；它体积只有几百字节、不含数据，比直接 `Read` 整个 `*.json`（动辄几 MB / 几万行）省**两到三个数量级**的上下文，不要 `require()`，用 `fs.readFileSync(outlineFile,'utf8')` 读最后一行即可。
+   - 真实数据始终从 `<section>-<accountId>.json` 通过代码获取，**不要**把 outline 当作业务数据贴给用户。
+5. **由代码写出最终文件**（HTML/Excel/PDF/PPT/Markdown/word 等）。**禁止**在报告脚本中以源码字面量写死应从 JSON 读取的业务数据（消耗金额、系列名、日期区间等）。允许的常量仅限：快照目录路径、JSON 字段键名、版式/结构占位。
+6. **报告首行**须标注：`统计区间：YYYY-MM-DD ~ YYYY-MM-DD（货币：XXX）`
 7. 交付后帮用户打开报告文件。
 
 ---
@@ -139,7 +139,7 @@ siluzan-tso google-analysis -a <id> --exclude materials,gold-account --json-out
 | `materials` | 合并图片+视频 `{ images, videos }` |
 | `resource-counts` | 结构统计 |
 | `conversion-actions` | 转化动作 |
-| `daily-metrics` | 按日报表 |
+| `daily-metrics` | 按日指标（主平台 `GET …/report/media-account/google/account-daily-reports`，`--json` 根为按日数组） |
 | `gold-account` | 黄金账户 |
 | `ads-index` | 质量指标 |
 | `final-urls` | 最终到达网址（不传 `--start`/`--end`） |

package/dist/skill/references/google-ads.md

@@ -980,6 +980,8 @@ siluzan-tso ad keyword-delete -a 6326027735 --id 2464982882313 --adgroup-id 1955
 
 **约束：** `--text`、`--match-type`、`--max-cpc`、`--final-url` 至少传一项。
 
+**匹配类型与文案：** Google 网关 V2 根据 `keywordText` 上的 `"` / `[` `]` 推断实际 MatchType（会覆盖仅传的 `matchTypeV2`）。因此只要传 `--match-type`，CLI **默认**把 `keywordText` 规范为词干 / `"词干"` / `[词干]` 并写入 `matchTypeV2`，无需额外开关；仅改匹配时可不传 `--text`（用列表里的当前文案去外层括号后再包一层）。
+
 ```bash
 siluzan-tso ad keyword-edit \
   -a <accountId> \
@@ -1009,6 +1011,8 @@ siluzan-tso ad keyword-edit -a 6326027735 --id 2081924039951 \
 
 ## ad keyword-negative-edit — 否词编辑
 
+与搜索词相同：传 `--match-type` 时 CLI 会默认同步改写 `keywordText` 外层括号/引号。
+
 ```bash
 siluzan-tso ad keyword-negative-edit \
   -a <accountId> \

package/package.json

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