siluzan-tso-cli 1.1.13 → 1.1.14-beta.10

package/dist/index.js

@@ -1962,7 +1962,7 @@ import { fileURLToPath as fileURLToPath4 } from "url";
 import { Command } from "commander";
 
 // src/config/defaults.ts
-var DEFAULT_API_BASE = "https://tso-api.siluzan.com";
+var DEFAULT_API_BASE = "https://tso-api-ci.siluzan.com";
 
 // ../common/dist/index.js
 import * as fs from "fs";
@@ -2441,19 +2441,19 @@ import * as fs3 from "fs/promises";
 import * as path3 from "path";
 async function getSkillFiles(skillDir) {
   const out = {};
-  async function walk(dir, prefix) {
+  async function walk2(dir, prefix) {
     const entries = await fs3.readdir(dir, { withFileTypes: true });
     for (const ent of entries) {
       const rel = prefix ? `${prefix}/${ent.name}` : ent.name;
       const full = path3.join(dir, ent.name);
       if (ent.isDirectory()) {
-        await walk(full, rel);
+        await walk2(full, rel);
       } else {
         out[rel] = await fs3.readFile(full, "utf8");
       }
     }
   }
-  await walk(skillDir, "");
+  await walk2(skillDir, "");
   return out;
 }
 
@@ -2872,8 +2872,9 @@ function fmt(d) {
 }
 function defaultDateRange() {
   const end = /* @__PURE__ */ new Date();
-  const start = /* @__PURE__ */ new Date();
-  start.setDate(start.getDate() - 7);
+  end.setDate(end.getDate() - 1);
+  const start = new Date(end);
+  start.setDate(start.getDate() - 6);
   return { startDate: fmt(start), endDate: fmt(end) };
 }
 async function fetchBalanceMap(media, accountIds, config, startDate, endDate, verbose) {
@@ -3676,18 +3677,25 @@ var VALID_MEDIA_TYPES2 = ["Google", "TikTok", "Yandex", "MetaAd", "BingV2", "Kwa
 async function runBalance(opts) {
   const config = loadConfig(opts.token);
   if (!VALID_MEDIA_TYPES2.includes(opts.media)) {
-    console.error(
-      `
-\u274C \u4E0D\u652F\u6301\u7684\u5A92\u4F53\u7C7B\u578B\uFF1A${opts.media}
-   \u53EF\u9009\u503C\uFF1A${VALID_MEDIA_TYPES2.join(" | ")}
-`
-    );
+    const msg = `\u4E0D\u652F\u6301\u7684\u5A92\u4F53\u7C7B\u578B\uFF1A${opts.media}\uFF08\u53EF\u9009\uFF1A${VALID_MEDIA_TYPES2.join(" | ")}\uFF09`;
+    if (opts.json) {
+      console.log(JSON.stringify({ ok: false, error: msg }, null, 2));
+      process.exit(1);
+    }
+    console.error(`
+\u274C ${msg}
+`);
     process.exit(1);
   }
   const media = opts.media;
   if (!BALANCE_SUPPORTED_MEDIA.includes(media)) {
+    const msg = `${media} \u6682\u4E0D\u652F\u6301\u4F59\u989D\u67E5\u8BE2`;
+    if (opts.json) {
+      console.log(JSON.stringify({ ok: false, error: msg }, null, 2));
+      process.exit(1);
+    }
     console.error(`
-\u26A0\uFE0F  ${media} \u6682\u4E0D\u652F\u6301\u4F59\u989D\u67E5\u8BE2
+\u26A0\uFE0F  ${msg}
 `);
     process.exit(1);
   }
@@ -3707,8 +3715,13 @@ async function runBalance(opts) {
       opts.verbose
     );
   } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    if (opts.json) {
+      console.log(JSON.stringify({ ok: false, error: message }, null, 2));
+      process.exit(1);
+    }
     console.error(`
-\u274C \u67E5\u8BE2\u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}
+\u274C \u67E5\u8BE2\u5931\u8D25\uFF1A${message}
 `);
     process.exit(1);
   }
@@ -3948,18 +3961,54 @@ async function runBalanceScan(opts) {
     const CHUNK = 100;
     const chunks = [];
     for (let i = 0; i < validIds.length; i += CHUNK) chunks.push(validIds.slice(i, i + CHUNK));
+    process.stderr.write(
+      `\u23F3 [balance-scan] \u6709\u6548\u8D26\u6237 ${validIds.length} \u4E2A\uFF0C\u5206 ${chunks.length} \u6279\uFF1B\u4F59\u989D\u4E0E\u8FD1 7 \u65E5\u6D88\u8017\u5E76\u884C\u8BF7\u6C42\uFF08\u5355\u8BF7\u6C42\u6700\u957F\u7EA6 10 \u5206\u949F\uFF09\u3002
+`
+    );
+    const logBalanceChunk = (idx, ids, m) => {
+      process.stderr.write(
+        `   \u2713 [\u4F59\u989D] \u7B2C ${idx + 1}/${chunks.length} \u6279\u5B8C\u6210\uFF08${ids.length} \u6237 \u2192 ${m.size} \u6761\uFF09
+`
+      );
+    };
+    const logOverviewChunk = (idx, ids, m) => {
+      process.stderr.write(
+        `   \u2713 [\u8FD17\u65E5\u6D88\u8017] \u7B2C ${idx + 1}/${chunks.length} \u6279\u5B8C\u6210\uFF08${ids.length} \u6237 \u2192 ${m.size} \u6761\uFF09
+`
+      );
+    };
     const [bMaps, oMaps] = await Promise.all([
       Promise.all(
-        chunks.map(
-          (ids) => fetchBalanceMap(media, ids, config, void 0, void 0, opts.verbose)
-        )
+        chunks.map((ids, chunkIdx) => {
+          process.stderr.write(
+            `   \u2192 [\u4F59\u989D] \u7B2C ${chunkIdx + 1}/${chunks.length} \u6279\u8BF7\u6C42\u4E2D\uFF08${ids.length} \u6237\uFF09\u2026
+`
+          );
+          return fetchBalanceMap(media, ids, config, void 0, void 0, opts.verbose).then(
+            (m) => {
+              logBalanceChunk(chunkIdx, ids, m);
+              return m;
+            }
+          );
+        })
       ),
       Promise.all(
-        chunks.map(
-          (ids) => fetchOverviewMap(media, ids, config, void 0, void 0, opts.verbose)
-        )
+        chunks.map((ids, chunkIdx) => {
+          process.stderr.write(
+            `   \u2192 [\u8FD17\u65E5\u6D88\u8017] \u7B2C ${chunkIdx + 1}/${chunks.length} \u6279\u8BF7\u6C42\u4E2D\uFF08${ids.length} \u6237\uFF09\u2026
+`
+          );
+          return fetchOverviewMap(media, ids, config, void 0, void 0, opts.verbose).then(
+            (m) => {
+              logOverviewChunk(chunkIdx, ids, m);
+              return m;
+            }
+          );
+        })
       )
     ]);
+    process.stderr.write(`\u23F3 [balance-scan] \u4F59\u989D\u4E0E\u6D88\u8017\u5DF2\u9F50\uFF0C\u6B63\u5728\u6309\u9608\u503C\u7B5B\u9009\u2026
+`);
     for (const m of bMaps) for (const [k, v] of m) balanceMap.set(k, v);
     for (const m of oMaps) for (const [k, v] of m) overviewMap.set(k, v);
   }
@@ -4382,8 +4431,13 @@ async function runStats(opts) {
   try {
     raw = await apiFetch2(url, config, {}, opts.verbose);
   } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    if (opts.json) {
+      console.log(JSON.stringify({ ok: false, error: message }, null, 2));
+      process.exit(1);
+    }
     console.error(`
-\u274C \u67E5\u8BE2\u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}
+\u274C \u67E5\u8BE2\u5931\u8D25\uFF1A${message}
 `);
     process.exit(1);
   }
@@ -5070,6 +5124,37 @@ async function runReportPushReceiveEmails(opts) {
   console.log();
 }
 
+// src/utils/strip-legacy-google-fields.ts
+var LEGACY_WHEN_V2_PRESENT = [
+  ["status", "statusV2"],
+  ["channelType", "channelTypeV2"],
+  ["subChannelType", "subChannelTypeV2"],
+  ["biddingStrategyType", "biddingStrategyTypeV2"],
+  ["campaignStatus", "campaignStatusV2"],
+  ["adGroupStatus", "adGroupStatusV2"],
+  ["matchType", "matchTypeV2"],
+  ["type", "typeV2"]
+];
+function stripLegacyGoogleFieldsIfV2Present(value) {
+  return walk(value);
+}
+function walk(obj) {
+  if (Array.isArray(obj)) return obj.map(walk);
+  if (obj !== null && typeof obj === "object") {
+    const o = { ...obj };
+    for (const [legacy, modern] of LEGACY_WHEN_V2_PRESENT) {
+      if (modern in o && legacy in o) {
+        delete o[legacy];
+      }
+    }
+    for (const k of Object.keys(o)) {
+      o[k] = walk(o[k]);
+    }
+    return o;
+  }
+  return obj;
+}
+
 // src/commands/google-analysis.ts
 var SECTIONS = [
   {
@@ -5100,6 +5185,12 @@ var SECTIONS = [
     dateMode: "range",
     path: (id) => `/reporting/media-account/${id}/CampaignSectionData`
   },
+  {
+    name: "campaign-hour",
+    description: "\u7CFB\u5217\u6309\u5C0F\u65F6 campaign-hour\uFF08Query\uFF1AstartDate\u3001endDate\uFF09",
+    dateMode: "range",
+    path: (id) => `/reporting/media-account/${id}/campaign-hour`
+  },
   {
     name: "ads",
     description: "\u5E7F\u544A\u7EA7\u5217\u8868 admanagement/v2/list",
@@ -5235,6 +5326,55 @@ async function fetchJson(config, pathWithQuery, verbose) {
   const url = `${config.googleApiUrl}${pathWithQuery}`;
   return apiFetch2(url, config, {}, verbose);
 }
+function assertNever(x, ctx) {
+  throw new Error(`${ctx}\uFF1A\u672A\u5904\u7406\u7684\u5206\u652F ${String(x)}`);
+}
+async function fetchGoogleAnalysisSectionJson(config, fullPath, verbose, name) {
+  switch (name) {
+    case "overview":
+      return fetchJson(config, fullPath, verbose);
+    case "keywords":
+      return fetchJson(config, fullPath, verbose);
+    case "search-terms":
+      return fetchJson(config, fullPath, verbose);
+    case "campaigns":
+      return fetchJson(config, fullPath, verbose);
+    case "campaign-hour":
+      return fetchJson(config, fullPath, verbose);
+    case "ads":
+      return fetchJson(config, fullPath, verbose);
+    case "extensions":
+      return fetchJson(config, fullPath, verbose);
+    case "devices":
+      return fetchJson(config, fullPath, verbose);
+    case "geographic":
+      return fetchJson(config, fullPath, verbose);
+    case "audience":
+      return fetchJson(config, fullPath, verbose);
+    case "asset-images":
+      return fetchJson(config, fullPath, verbose);
+    case "videos":
+      return fetchJson(config, fullPath, verbose);
+    case "resource-counts":
+      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":
+      return fetchJson(config, fullPath, verbose);
+    case "final-urls":
+      return fetchJson(config, fullPath, verbose);
+    case "dimension-summary":
+      return fetchJson(config, fullPath, verbose);
+    case "campaign-types":
+      return fetchJson(config, fullPath, verbose);
+    default:
+      return assertNever(name, "google-analysis");
+  }
+}
 function summarizeHuman(section, data) {
   if (data === null || data === void 0) return "\u65E0\u6570\u636E";
   if (Array.isArray(data)) return `\u6570\u7EC4\uFF0C\u5171 ${data.length} \u6761`;
@@ -5292,7 +5432,7 @@ async function runOneSection(def, opts) {
       ]);
       const merged = { images, videos };
       if (opts.json) {
-        console.log(JSON.stringify(merged, null, 2));
+        console.log(JSON.stringify(stripLegacyGoogleFieldsIfV2Present(merged), null, 2));
         return;
       }
       const iLen = Array.isArray(images) ? images.length : 0;
@@ -5305,9 +5445,14 @@ async function runOneSection(def, opts) {
       );
       return;
     }
-    const data = await fetchJson(config, fullPath, !!opts.verbose);
+    const data = await fetchGoogleAnalysisSectionJson(
+      config,
+      fullPath,
+      !!opts.verbose,
+      def.name
+    );
     if (opts.json) {
-      console.log(JSON.stringify(data, null, 2));
+      console.log(JSON.stringify(stripLegacyGoogleFieldsIfV2Present(data), null, 2));
       return;
     }
     console.log(
@@ -6791,6 +6936,12 @@ function toDisplayMoney(raw) {
   if (!Number.isFinite(n)) return null;
   return n / 100;
 }
+function toCentAmount(displayValue) {
+  if (!Number.isFinite(displayValue)) {
+    throw new Error(`toCentAmount: \u8F93\u5165\u5FC5\u987B\u662F\u6709\u9650\u6570\u5B57\uFF0C\u6536\u5230 ${displayValue}`);
+  }
+  return Math.round(displayValue * 100);
+}
 function adgroupListUrl(googleApiUrl, account, startDate, endDate) {
   const params = new URLSearchParams();
   params.set("startDate", toGoogleDate(startDate, -30));
@@ -6806,6 +6957,39 @@ function requireGoogleApi(config) {
   }
   return config.googleApiUrl;
 }
+function formatGoogleCampaignListStatus(row) {
+  let result = "-";
+  const raw = row.statusV2;
+  if (raw == null || String(raw).trim() === "") return result;
+  const statusV2 = String(raw).toUpperCase();
+  const start = parseCampaignTimeMs(row.startTime);
+  const end = parseCampaignTimeMs(row.endTime);
+  if (start == null || end == null) return result;
+  const now = Date.now();
+  if (statusV2 === "PAUSED") {
+    if (now > start && now < end) {
+      result = "\u5DF2\u6682\u505C";
+    } else if (now > end) {
+      result = "\u5DF2\u7ED3\u675F\u4F7F\u7528";
+    } else if (now < start) {
+      result = "\u672A\u6295\u653E";
+    }
+  } else if (statusV2 === "ENABLED") {
+    if (now > start && now < end) {
+      result = "\u6709\u6548";
+    } else if (now > end) {
+      result = "\u5DF2\u7ED3\u675F\u4F7F\u7528";
+    } else if (now < start) {
+      result = "\u672A\u6295\u653E";
+    }
+  }
+  return result;
+}
+function parseCampaignTimeMs(v) {
+  if (v == null || v === "") return null;
+  const t = new Date(v).getTime();
+  return Number.isFinite(t) ? t : null;
+}
 async function runAdCampaigns(opts) {
   const config = loadConfig(opts.token);
   const googleApiUrl = requireGoogleApi(config);
@@ -6828,18 +7012,19 @@ async function runAdCampaigns(opts) {
     return {
       ...item,
       budgetDisplay,
-      budgetUnit: "display"
+      budgetUnit: "display",
+      statusDisplay: formatGoogleCampaignListStatus(item)
     };
   });
   const n = items.length;
   if (opts.json) {
     console.log(
       JSON.stringify(
-        {
+        stripLegacyGoogleFieldsIfV2Present({
           ...wrapListJson({ page: 1, pageSize: Math.max(n, 1), total: n, items }),
           code: data.code ?? null,
           message: data.message ?? null
-        },
+        }),
         null,
         2
       )
@@ -6874,7 +7059,7 @@ async function runAdCampaigns(opts) {
     const budget = item.budgetDisplay != null ? item.budgetDisplay.toFixed(2) : "\u2014";
     return {
       name: (item.name ?? "").slice(0, nameW),
-      status: item.statusV2 ?? "",
+      status: item.statusDisplay ?? formatGoogleCampaignListStatus(item),
       channelType: item.channelTypeV2 ?? "",
       bidding: String(item.biddingStrategyTypeV2 ?? ""),
       budget,
@@ -6917,10 +7102,10 @@ async function runAdGroups(opts) {
   if (opts.json) {
     console.log(
       JSON.stringify(
-        {
+        stripLegacyGoogleFieldsIfV2Present({
           ...wrapListJson({ page: 1, pageSize: Math.max(n, 1), total: n, items }),
           code: data.code ?? null
-        },
+        }),
         null,
         2
       )
@@ -6976,6 +7161,9 @@ async function runAdList(opts) {
   const params = new URLSearchParams();
   params.set("startDate", toGoogleDate(opts.startDate, -30));
   params.set("endDate", toGoogleDate(opts.endDate, 0));
+  if (opts.includeDeleted) {
+    params.set("readDeleted", "true");
+  }
   const url = `${googleApiUrl}/admanagement/v2/list/${opts.account}?${params}`;
   let data;
   try {
@@ -6990,7 +7178,13 @@ async function runAdList(opts) {
   const n = items.length;
   if (opts.json) {
     console.log(
-      JSON.stringify(wrapListJson({ page: 1, pageSize: Math.max(n, 1), total: n, items }), null, 2)
+      JSON.stringify(
+        stripLegacyGoogleFieldsIfV2Present(
+          wrapListJson({ page: 1, pageSize: Math.max(n, 1), total: n, items })
+        ),
+        null,
+        2
+      )
     );
     return;
   }
@@ -7027,7 +7221,7 @@ async function runAdList(opts) {
       campaign: String(item["campaign"] ?? "").slice(0, campW),
       adGroup: String(item["adGroup"] ?? "").slice(0, grpW),
       status: String(item["statusV2"]),
-      type: String(item["typeV2"] ?? item["type"] ?? ""),
+      type: String(item["typeV2"] ?? ""),
       impressions: String(item["impressions"] ?? 0),
       clicks: String(item["clicks"] ?? 0),
       ctr,
@@ -7066,7 +7260,13 @@ async function runAdKeywords(opts) {
   const n = items.length;
   if (opts.json) {
     console.log(
-      JSON.stringify(wrapListJson({ page: 1, pageSize: Math.max(n, 1), total: n, items }), null, 2)
+      JSON.stringify(
+        stripLegacyGoogleFieldsIfV2Present(
+          wrapListJson({ page: 1, pageSize: Math.max(n, 1), total: n, items })
+        ),
+        null,
+        2
+      )
     );
     return;
   }
@@ -7082,7 +7282,7 @@ ${label}\uFF08\u8D26\u6237\uFF1A${opts.account}\uFF0C\u7B2C 1 \u9875\uFF0C\u672C
   if (opts.negative) {
     items.forEach((item) => {
       const kwText = Array.isArray(item["keywordText"]) ? item["keywordText"].join(", ") : String(item["text"] ?? item["keywordText"] ?? item["id"] ?? "\u2014");
-      const matchType = item["matchTypeV2"] ?? item["matchType"] ?? "\u2014";
+      const matchType = item["matchTypeV2"] ?? "\u2014";
       console.log(`  [${matchType}] ${kwText}  id: ${String(item["id"] ?? "")}`);
     });
   } else {
@@ -7113,8 +7313,8 @@ ${label}\uFF08\u8D26\u6237\uFF1A${opts.account}\uFF0C\u7B2C 1 \u9875\uFF0C\u672C
       const kwText = String(item["text"] ?? item["keywordText"] ?? "\u2014");
       const campaign = String(item["campaignName"] ?? item["campaign"] ?? "");
       const adGroup = String(item["adGroupName"] ?? item["adGroup"] ?? "");
-      const status = String(item["status"] ?? item["userStatus"] ?? "");
-      const matchType = String(item["matchTypeV2"] ?? item["matchType"] ?? "");
+      const status = String(item["userStatus"] ?? "");
+      const matchType = String(item["matchTypeV2"] ?? "");
       const ctr = item["ctr"] != null ? (Number(item["ctr"]) * 100).toFixed(2) + "%" : "\u2014";
       const spend = item["spend"] != null ? Number(item["spend"]).toFixed(2) : "\u2014";
       return {
@@ -7211,7 +7411,8 @@ async function runAdGroupCreate(opts) {
     campaignId: opts.campaignId,
     campaignName: opts.campaignName,
     manualCpc_EnhancedCpcEnabled: false,
-    maxCPCAmount: opts.maxCpc,
+    // 用户传主币种金额，统一 toCentAmount 转「分」（与前端、adgroup-edit 一致）
+    maxCPCAmount: toCentAmount(opts.maxCpc),
     name: opts.name,
     rotationMode: 1,
     statusV2: opts.status ?? "ENABLED",
@@ -7914,6 +8115,53 @@ async function runAdGroupRename(opts) {
 \u2705 \u5E7F\u544A\u7EC4 ${opts.id} \u5DF2\u6539\u540D\u4E3A\u300C${opts.name}\u300D
 `);
 }
+async function runAdGroupEdit(opts) {
+  const hasName = opts.name !== void 0 && opts.name.trim() !== "";
+  const hasMax = opts.maxCPCAmount !== void 0;
+  const hasTcpa = opts.targetCpaAmount !== void 0;
+  if (!hasName && !hasMax && !hasTcpa) {
+    console.error(
+      "\n\u274C \u8BF7\u81F3\u5C11\u6307\u5B9A\u4E00\u9879\u4FEE\u6539\uFF1A--name / --max-cpc / --target-cpa\n"
+    );
+    process.exit(1);
+  }
+  if (hasMax && (!Number.isFinite(opts.maxCPCAmount) || opts.maxCPCAmount < 0)) {
+    console.error("\n\u274C --max-cpc \u987B\u4E3A\u975E\u8D1F\u6570\u5B57\n");
+    process.exit(1);
+  }
+  if (hasTcpa && (!Number.isFinite(opts.targetCpaAmount) || opts.targetCpaAmount < 0)) {
+    console.error("\n\u274C --target-cpa \u987B\u4E3A\u975E\u8D1F\u6570\u5B57\n");
+    process.exit(1);
+  }
+  const config = loadConfig(opts.token);
+  const googleApiUrl = requireGoogleApi(config);
+  const listUrl = adgroupListUrl(googleApiUrl, opts.account, opts.startDate, opts.endDate);
+  let adgroup;
+  try {
+    adgroup = await findItemInList(listUrl, config, opts.id, opts.verbose);
+  } catch (err) {
+    console.error(`
+\u274C \u67E5\u8BE2\u5E7F\u544A\u7EC4\u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}
+`);
+    process.exit(1);
+  }
+  const body = { ...adgroup };
+  if (hasName) body["name"] = opts.name.trim();
+  if (hasMax) body["maxCPCAmount"] = toCentAmount(opts.maxCPCAmount);
+  if (hasTcpa) body["targetCpaAmount"] = toCentAmount(opts.targetCpaAmount);
+  const putUrl = `${googleApiUrl}/adgroupnmanagement/adgroup/${opts.account}/${opts.id}`;
+  try {
+    await apiFetch2(putUrl, config, { method: "PUT", body: JSON.stringify(body) }, opts.verbose);
+  } catch (err) {
+    console.error(`
+\u274C \u7F16\u8F91\u5E7F\u544A\u7EC4\u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}
+`);
+    process.exit(1);
+  }
+  console.log(`
+\u2705 \u5E7F\u544A\u7EC4 ${opts.id} \u5DF2\u66F4\u65B0
+`);
+}
 async function runAdEdit(opts) {
   const config = await ensureDataPermission(loadConfig(opts.token));
   const googleApiUrl = requireGoogleApi(config);
@@ -8101,11 +8349,12 @@ async function runAdCampaignEdit(opts) {
   }
   const body = { ...campaign };
   if (opts.name !== void 0) body["name"] = opts.name;
-  if (opts.budget !== void 0) body["budget"] = opts.budget;
+  if (opts.budget !== void 0) body["budget"] = toCentAmount(opts.budget);
   if (opts.biddingStrategy !== void 0) body["biddingStrategyTypeV2"] = opts.biddingStrategy;
   if (opts.targetSpendBidCeiling !== void 0)
-    body["targetSpend_BidCeilingAmount"] = opts.targetSpendBidCeiling;
-  if (opts.targetCpa !== void 0) body["targetCpa_BidingAmount"] = opts.targetCpa;
+    body["targetSpend_BidCeilingAmount"] = toCentAmount(opts.targetSpendBidCeiling);
+  if (opts.targetCpa !== void 0)
+    body["targetCpa_BidingAmount"] = toCentAmount(opts.targetCpa);
   if (opts.targetSearchNetwork !== void 0)
     body["targetSearchNetwork"] = opts.targetSearchNetwork;
   if (opts.targetContentNetwork !== void 0)
@@ -8145,7 +8394,13 @@ async function runAdExtensionList(opts) {
   const n = items.length;
   if (opts.json) {
     console.log(
-      JSON.stringify(wrapListJson({ page: 1, pageSize: Math.max(n, 1), total: n, items }), null, 2)
+      JSON.stringify(
+        stripLegacyGoogleFieldsIfV2Present(
+          wrapListJson({ page: 1, pageSize: Math.max(n, 1), total: n, items })
+        ),
+        null,
+        2
+      )
     );
     return;
   }
@@ -8278,7 +8533,13 @@ async function runAdSearchTerms(opts) {
   const n = items.length;
   if (opts.json) {
     console.log(
-      JSON.stringify(wrapListJson({ page: 1, pageSize: Math.max(n, 1), total: n, items }), null, 2)
+      JSON.stringify(
+        stripLegacyGoogleFieldsIfV2Present(
+          wrapListJson({ page: 1, pageSize: Math.max(n, 1), total: n, items })
+        ),
+        null,
+        2
+      )
     );
     return;
   }
@@ -8321,7 +8582,7 @@ async function runAdSearchTerms(opts) {
       term: term.slice(0, termW),
       campaign: String(item["campaignName"] ?? "").slice(0, campW),
       adGroup: String(item["adGroupName"] ?? "").slice(0, grpW),
-      matchType: String(item["matchType"] ?? ""),
+      matchType: String(item["matchTypeV2"] ?? ""),
       impressions: String(item["impressions"] ?? 0),
       clicks: String(item["clicks"] ?? 0),
       ctr,
@@ -8355,7 +8616,7 @@ async function runAdGeoSearch(opts) {
   for (const item of items) {
     const id = String(item["id"] ?? "");
     const name = String(item["locationName"] ?? item["canonicalName"] ?? item["name"] ?? "");
-    const type = String(item["targetType"] ?? item["typeV2"] ?? item["type"] ?? "");
+    const type = String(item["targetType"] ?? item["typeV2"] ?? "");
     console.log(`  id:${id}  ${name}  [${type}]`);
   }
   console.log();
@@ -8391,7 +8652,13 @@ async function runAdGeoList(opts) {
   const n = items.length;
   if (opts.json) {
     console.log(
-      JSON.stringify(wrapListJson({ page: 1, pageSize: Math.max(n, 1), total: n, items }), null, 2)
+      JSON.stringify(
+        stripLegacyGoogleFieldsIfV2Present(
+          wrapListJson({ page: 1, pageSize: Math.max(n, 1), total: n, items })
+        ),
+        null,
+        2
+      )
     );
     return;
   }
@@ -9415,8 +9682,13 @@ async function fetchTikTokClues(opts, config) {
     );
     leads = Array.isArray(res) ? res : res.data ?? [];
   } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    if (opts.json) {
+      console.log(JSON.stringify({ ok: false, error: message, items: [] }, null, 2));
+      process.exit(1);
+    }
     console.error(`
-\u274C \u67E5\u8BE2\u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}
+\u274C \u67E5\u8BE2\u5931\u8D25\uFF1A${message}
 `);
     process.exit(1);
   }
@@ -9463,8 +9735,13 @@ async function fetchMetaClues(opts, config) {
   try {
     raw = await apiFetch2(url, config, {}, opts.verbose);
   } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    if (opts.json) {
+      console.log(JSON.stringify({ ok: false, error: message, items: [] }, null, 2));
+      process.exit(1);
+    }
     console.error(`
-\u274C \u67E5\u8BE2\u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}
+\u274C \u67E5\u8BE2\u5931\u8D25\uFF1A${message}
 `);
     process.exit(1);
   }
@@ -12121,14 +12398,14 @@ program.command("accounts-digest").description(
 program.command("stats").description("\u67E5\u8BE2\u5E7F\u544A\u6D88\u8017\u3001\u70B9\u51FB\u3001\u8F6C\u5316\u7B49\u6295\u653E\u6570\u636E\uFF08\u9ED8\u8BA4\u8FD1 7 \u5929\uFF0C\u4E0D\u542B\u4ECA\u5929\uFF09").requiredOption(
   "-m, --media <type>",
   "\u5A92\u4F53\u7C7B\u578B\uFF1AGoogle | TikTok | Yandex | MetaAd | BingV2 | Kwai"
-).option("-a, --accounts <ids>", "\u8D26\u6237 ID\uFF0C\u591A\u4E2A\u7528\u9017\u53F7\u5206\u9694\uFF08\u7559\u7A7A\u5219\u67E5\u5168\u90E8\u8D26\u6237\uFF09").option("--start <date>", "\u5F00\u59CB\u65E5\u671F\uFF0C\u683C\u5F0F YYYY-MM-DD\uFF08\u9ED8\u8BA4 7 \u5929\u524D\uFF09").option("--end <date>", "\u7ED3\u675F\u65E5\u671F\uFF0C\u683C\u5F0F YYYY-MM-DD\uFF08\u9ED8\u8BA4\u6628\u5929\uFF09").option("-t, --token <token>", "Token\uFF08\u53EF\u9009\uFF1B\u4F18\u5148\u4E8E ~/.siluzan/config.json\uFF09").option("--json", "\u4EE5 JSON \u683C\u5F0F\u8F93\u51FA\u539F\u59CB\u54CD\u5E94", false).option("--verbose", "\u663E\u793A\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F", false).action(
+).option("-a, --accounts <ids>", "\u8D26\u6237 ID\uFF0C\u591A\u4E2A\u7528\u9017\u53F7\u5206\u9694\uFF08\u7559\u7A7A\u5219\u67E5\u5168\u90E8\u8D26\u6237\uFF09").option("--start <date>", "\u5F00\u59CB\u65E5\u671F\uFF0C\u683C\u5F0F YYYY-MM-DD\uFF08\u9ED8\u8BA4 7 \u5929\u524D\uFF09").option("--end <date>", "\u7ED3\u675F\u65E5\u671F\uFF0C\u683C\u5F0F YYYY-MM-DD\uFF08\u9ED8\u8BA4\u6628\u5929\uFF09").option("--start-date <date>", "\u540C --start\uFF08\u6587\u6863/Playbook \u517C\u5BB9\u522B\u540D\uFF09").option("--end-date <date>", "\u540C --end\uFF08\u6587\u6863/Playbook \u517C\u5BB9\u522B\u540D\uFF09").option("-t, --token <token>", "Token\uFF08\u53EF\u9009\uFF1B\u4F18\u5148\u4E8E ~/.siluzan/config.json\uFF09").option("--json", "\u4EE5 JSON \u683C\u5F0F\u8F93\u51FA\u539F\u59CB\u54CD\u5E94", false).option("--verbose", "\u663E\u793A\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F", false).action(
   async (opts) => {
     await runStats({
       token: opts.token,
       media: opts.media,
       accounts: opts.accounts,
-      startDate: opts.start,
-      endDate: opts.end,
+      startDate: opts.start ?? opts.startDate,
+      endDate: opts.end ?? opts.endDate,
       json: opts.json,
       verbose: opts.verbose
     });
@@ -12757,13 +13034,14 @@ adCmd.command("groups").description("\u67E5\u8BE2\u5E7F\u544A\u7EC4\u5217\u8868\
     });
   }
 );
-adCmd.command("list").description("\u67E5\u8BE2\u5E7F\u544A\uFF08\u521B\u610F\uFF09\u5217\u8868\uFF08\u65E5\u671F\u9ED8\u8BA4\u8FD1 30 \u5929\uFF09").requiredOption("-a, --account <id>", "Google \u8D26\u6237 mediaCustomerId").option("--start <date>", "\u5F00\u59CB\u65E5\u671F YYYY-MM-DD\uFF08\u9ED8\u8BA4 30 \u5929\u524D\uFF09").option("--end <date>", "\u7ED3\u675F\u65E5\u671F YYYY-MM-DD\uFF08\u9ED8\u8BA4\u4ECA\u5929\uFF09").option("-t, --token <token>", "Auth Token").option("--json", "JSON \u683C\u5F0F\u8F93\u51FA", false).option("--verbose", "\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F", false).action(
+adCmd.command("list").description("\u67E5\u8BE2\u5E7F\u544A\uFF08\u521B\u610F\uFF09\u5217\u8868\uFF08\u65E5\u671F\u9ED8\u8BA4\u8FD1 30 \u5929\uFF09").requiredOption("-a, --account <id>", "Google \u8D26\u6237 mediaCustomerId").option("--start <date>", "\u5F00\u59CB\u65E5\u671F YYYY-MM-DD\uFF08\u9ED8\u8BA4 30 \u5929\u524D\uFF09").option("--end <date>", "\u7ED3\u675F\u65E5\u671F YYYY-MM-DD\uFF08\u9ED8\u8BA4\u4ECA\u5929\uFF09").option("--include-deleted", "\u5305\u542B\u5DF2\u5220\u9664\u7684\u5E7F\u544A\uFF08\u7F51\u5173 readDeleted=true\uFF09", false).option("-t, --token <token>", "Auth Token").option("--json", "JSON \u683C\u5F0F\u8F93\u51FA", false).option("--verbose", "\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F", false).action(
   async (opts) => {
     await runAdList({
       token: opts.token,
       account: opts.account,
       startDate: opts.start,
       endDate: opts.end,
+      includeDeleted: opts.includeDeleted,
       json: opts.json,
       verbose: opts.verbose
     });
@@ -12807,8 +13085,8 @@ adCmd.command("campaign-delete").description("\u5220\u9664\u5E7F\u544A\u7CFB\u52
 });
 adCmd.command("adgroup-create").description("\u5728\u5E7F\u544A\u7CFB\u5217\u4E0B\u521B\u5EFA\u641C\u7D22\u5E7F\u544A\u7EC4").requiredOption("-a, --account <id>", "Google \u8D26\u6237 mediaCustomerId").requiredOption("--campaign-id <id>", "\u6240\u5C5E\u5E7F\u544A\u7CFB\u5217 ID").requiredOption("--campaign-name <name>", "\u6240\u5C5E\u5E7F\u544A\u7CFB\u5217\u540D\u79F0").requiredOption("--name <name>", "\u5E7F\u544A\u7EC4\u540D\u79F0").requiredOption(
   "--max-cpc <amount>",
-  "\u6700\u9AD8\u5355\u6B21\u70B9\u51FB\u8D39\u7528\uFF08\u6700\u5C0F\u8D27\u5E01\u5355\u4F4D\uFF0C\u5982 100000 = 1 USD\uFF09",
-  parseInt
+  "\u6700\u9AD8\u5355\u6B21\u70B9\u51FB\u8D39\u7528\uFF0C\u4E3B\u5E01\u79CD\u91D1\u989D\uFF08\u5982 1.5 \u8868\u793A \xA51.50\uFF1BCLI \u5185\u90E8 \xD7100 \u5199\u5165\u300C\u5206\u300D\uFF09",
+  parseFloat
 ).option("--status <status>", "\u72B6\u6001\uFF1AENABLED | PAUSED\uFF08\u9ED8\u8BA4 ENABLED\uFF09", "ENABLED").option("-t, --token <token>", "Auth Token").option("--verbose", "\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F", false).action(
   async (opts) => {
     await runAdGroupCreate({
@@ -13118,7 +13396,19 @@ adCmd.command("campaign-create").description(
     });
   }
 );
-adCmd.command("campaign-edit").description("\u7F16\u8F91\u5E7F\u544A\u7CFB\u5217\uFF08\u540D\u79F0/\u9884\u7B97/\u51FA\u4EF7\u7B56\u7565/\u6295\u653E\u7F51\u7EDC\uFF0C\u81F3\u5C11\u4F20\u4E00\u4E2A\u4FEE\u6539\u9879\uFF09").requiredOption("-a, --account <id>", "Google \u8D26\u6237 mediaCustomerId").requiredOption("--id <campaignId>", "\u5E7F\u544A\u7CFB\u5217 ID").option("--name <name>", "\u65B0\u540D\u79F0").option("--budget <amount>", "\u65B0\u9884\u7B97\uFF08\u6700\u5C0F\u8D27\u5E01\u5355\u4F4D\uFF0C\u5982 100000 = 1 USD\uFF09", parseInt).option("--bidding <strategy>", "\u51FA\u4EF7\u7B56\u7565\uFF1ATARGET_SPEND | TARGET_CPA | TARGET_ROAS | MANUAL_CPC").option("--bid-ceiling <amount>", "TARGET_SPEND \u51FA\u4EF7\u4E0A\u9650\uFF08\u6700\u5C0F\u8D27\u5E01\u5355\u4F4D\uFF0C0=\u4E0D\u9650\uFF09", parseInt).option("--target-cpa <amount>", "TARGET_CPA \u76EE\u6807 CPA\uFF08\u6700\u5C0F\u8D27\u5E01\u5355\u4F4D\uFF09", parseInt).option(
+adCmd.command("campaign-edit").description("\u7F16\u8F91\u5E7F\u544A\u7CFB\u5217\uFF08\u540D\u79F0/\u9884\u7B97/\u51FA\u4EF7\u7B56\u7565/\u6295\u653E\u7F51\u7EDC\uFF0C\u81F3\u5C11\u4F20\u4E00\u4E2A\u4FEE\u6539\u9879\uFF09").requiredOption("-a, --account <id>", "Google \u8D26\u6237 mediaCustomerId").requiredOption("--id <campaignId>", "\u5E7F\u544A\u7CFB\u5217 ID").option("--name <name>", "\u65B0\u540D\u79F0").option(
+  "--budget <amount>",
+  "\u65B0\u9884\u7B97\uFF0C\u4E3B\u5E01\u79CD\u91D1\u989D\uFF08\u5982 100 \u8868\u793A \xA5100\uFF1B\u652F\u6301\u5C0F\u6570\uFF1BCLI \u5185\u90E8\u81EA\u52A8 \xD7100 \u5199\u5165\u300C\u5206\u300D\u5B57\u6BB5\uFF09",
+  parseFloat
+).option("--bidding <strategy>", "\u51FA\u4EF7\u7B56\u7565\uFF1ATARGET_SPEND | TARGET_CPA | TARGET_ROAS | MANUAL_CPC").option(
+  "--bid-ceiling <amount>",
+  "TARGET_SPEND \u51FA\u4EF7\u4E0A\u9650\uFF0C\u4E3B\u5E01\u79CD\u91D1\u989D\uFF080 = \u4E0D\u9650\uFF1BCLI \u5185\u90E8 \xD7100 \u5199\u5165\uFF09",
+  parseFloat
+).option(
+  "--target-cpa <amount>",
+  "TARGET_CPA \u76EE\u6807 CPA\uFF0C\u4E3B\u5E01\u79CD\u91D1\u989D\uFF08CLI \u5185\u90E8 \xD7100 \u5199\u5165\uFF09",
+  parseFloat
+).option(
   "--search-network <bool>",
   "\u6295\u653E\u5230 Google \u641C\u7D22\uFF1Atrue | false",
   (v) => v === "true"
@@ -13152,6 +13442,29 @@ adCmd.command("adgroup-rename").description("\u4FEE\u6539\u5E7F\u544A\u7EC4\u540
     });
   }
 );
+adCmd.command("adgroup-edit").description("\u7F16\u8F91\u5E7F\u544A\u7EC4\uFF08\u540D\u79F0\u3001\u6700\u9AD8 CPC\u3001\u7EC4\u7EA7\u76EE\u6807 CPA\uFF1B\u81F3\u5C11\u4F20\u4E00\u9879\uFF1B\u4E0E\u7F51\u5173 PUT \u4E00\u81F4\uFF09").requiredOption("-a, --account <id>", "Google \u8D26\u6237 mediaCustomerId").requiredOption("--id <adgroupId>", "\u5E7F\u544A\u7EC4 ID").option("--name <name>", "\u65B0\u540D\u79F0").option(
+  "--max-cpc <n>",
+  "\u6700\u9AD8 CPC\uFF0C\u4E3B\u5E01\u79CD\u91D1\u989D\uFF08\u5982 1.5 \u8868\u793A \xA51.50\uFF1BCLI \u5185\u90E8 \xD7100 \u5199\u5165\u300C\u5206\u300D\u5B57\u6BB5\uFF09",
+  parseFloat
+).option(
+  "--target-cpa <n>",
+  "\u7EC4\u7EA7\u76EE\u6807 CPA\uFF0C\u4E3B\u5E01\u79CD\u91D1\u989D\uFF08CLI \u5185\u90E8 \xD7100 \u5199\u5165\u300C\u5206\u300D\u5B57\u6BB5\uFF09",
+  parseFloat
+).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) => {
+    await runAdGroupEdit({
+      token: opts.token,
+      account: opts.account,
+      id: opts.id,
+      name: opts.name,
+      maxCPCAmount: opts.maxCpc,
+      targetCpaAmount: opts.targetCpa,
+      startDate: opts.start,
+      endDate: opts.end,
+      verbose: opts.verbose
+    });
+  }
+);
 adCmd.command("ad-edit").description(
   "\u7F16\u8F91\u81EA\u9002\u5E94\u641C\u7D22\u5E7F\u544A\uFF08RESPONSIVE_SEARCH_AD\uFF09\uFF1A\u6807\u9898/\u63CF\u8FF0/\u843D\u5730\u9875/\u8DEF\u5F84/\u72B6\u6001\uFF1B\u4E0E\u7F51\u9875 PUT admanagement/campaign \u884C\u4E3A\u4E00\u81F4"
 ).requiredOption("-a, --account <id>", "Google \u8D26\u6237 mediaCustomerId").requiredOption("--id <adId>", "\u5E7F\u544A ID").option(
@@ -13195,7 +13508,10 @@ adCmd.command("keyword-delete").description("\u5220\u9664\u641C\u7D22\u5173\u952
     });
   }
 );
-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("--max-cpc <n>", "\u6700\u9AD8\u6BCF\u6B21\u70B9\u51FB\u8D39\u7528 maxCPC\uFF08\u6570\u5B57\uFF0C0 \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(
+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(
+  "--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(
   async (opts) => {
     if (opts.matchType && !["Broad", "Phrase", "Exact"].includes(opts.matchType)) {
       console.error("\n\u274C --match-type \u53EA\u63A5\u53D7 Broad | Phrase | Exact\n");