siluzan-tso-cli 1.1.34-beta.4 → 1.1.35-beta.1

package/README.md

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

package/dist/index.js

@@ -5754,6 +5754,150 @@ var init_sections = __esm({
   }
 });
 
+// src/utils/http-retry.ts
+function classifyError(err) {
+  const status = parseHttpStatusFromError(err);
+  if (status === 401) return { class: "abort", status };
+  if (status === void 0) {
+    return { class: "retryable" };
+  }
+  if (status === 408 || status === 429) return { class: "retryable", status };
+  if (status >= 500 && status <= 599) return { class: "retryable", status };
+  if (status >= 400 && status <= 499) return { class: "permanent", status };
+  return { class: "permanent", status };
+}
+function computeBackoffMs(attempt, policy) {
+  const exp = policy.baseMs * 2 ** Math.max(0, attempt - 1);
+  const capped = Math.min(exp, policy.maxBackoffMs);
+  const jitter = Math.floor(Math.random() * policy.baseMs);
+  return capped + jitter;
+}
+function sleep3(ms, signal) {
+  return new Promise((resolve15, reject) => {
+    if (signal?.aborted) {
+      reject(new Error("retry sleep aborted"));
+      return;
+    }
+    const timer = setTimeout(() => {
+      signal?.removeEventListener("abort", onAbort);
+      resolve15();
+    }, ms);
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(new Error("retry sleep aborted"));
+    };
+    signal?.addEventListener("abort", onAbort, { once: true });
+  });
+}
+async function withTaskTimeout(factory, timeoutMs, label) {
+  if (!timeoutMs || timeoutMs <= 0) return factory();
+  let timer;
+  try {
+    return await Promise.race([
+      factory(),
+      new Promise((_, reject) => {
+        timer = setTimeout(() => {
+          reject(new Error(`\u8BF7\u6C42\u8D85\u65F6\uFF08${(timeoutMs / 1e3).toFixed(0)} \u79D2\uFF09\uFF1A${label}`));
+        }, timeoutMs);
+      })
+    ]);
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+}
+async function fetchWithRetry(factory, options) {
+  const policy = { ...DEFAULT_RETRY_POLICY, ...options.policy ?? {} };
+  let lastErr;
+  let lastStatus;
+  for (let attempt = 1; attempt <= policy.maxAttempts; attempt++) {
+    if (options.signal?.aborted) {
+      throw new AbortRunError({
+        message: `\u4EFB\u52A1\u88AB\u5916\u90E8\u4FE1\u53F7\u4E2D\u6B62\uFF1A${options.label}`
+      });
+    }
+    try {
+      return await withTaskTimeout(factory, policy.taskTimeoutMs, options.label);
+    } catch (raw) {
+      const err = raw instanceof Error ? raw : new Error(String(raw));
+      const cls = classifyError(err);
+      lastErr = err;
+      lastStatus = cls.status;
+      if (cls.class === "abort") {
+        throw new AbortRunError({
+          message: `Token \u5931\u6548\u6216\u81F4\u547D\u9519\u8BEF\uFF08${options.label}\uFF09\uFF1A${err.message}`,
+          status: cls.status,
+          cause: err
+        });
+      }
+      if (cls.class === "permanent" || attempt >= policy.maxAttempts) {
+        throw new HttpRetryError({
+          message: cls.class === "permanent" ? `\u6C38\u4E45\u5931\u8D25\uFF08${options.label}\uFF09\uFF1A${err.message}` : `\u91CD\u8BD5 ${attempt} \u6B21\u4ECD\u5931\u8D25\uFF08${options.label}\uFF09\uFF1A${err.message}`,
+          class: cls.class === "permanent" ? "permanent" : "retryable",
+          status: cls.status,
+          attempts: attempt,
+          cause: err
+        });
+      }
+      const backoffMs = computeBackoffMs(attempt, policy);
+      options.onRetry?.({ attempt, backoffMs, status: cls.status, error: err });
+      try {
+        await sleep3(backoffMs, options.signal);
+      } catch {
+        throw new AbortRunError({
+          message: `\u91CD\u8BD5\u7B49\u5F85\u88AB\u4E2D\u6B62\uFF1A${options.label}`,
+          cause: err
+        });
+      }
+    }
+  }
+  throw new HttpRetryError({
+    message: `\u672A\u77E5\u91CD\u8BD5\u5931\u8D25\uFF08${options.label}\uFF09\uFF1A${lastErr?.message ?? "no error"}`,
+    class: "retryable",
+    status: lastStatus,
+    attempts: policy.maxAttempts,
+    cause: lastErr
+  });
+}
+var HttpRetryError, AbortRunError, DEFAULT_RETRY_POLICY;
+var init_http_retry = __esm({
+  "src/utils/http-retry.ts"() {
+    "use strict";
+    init_dist();
+    HttpRetryError = class extends Error {
+      class;
+      status;
+      attempts;
+      cause;
+      constructor(opts) {
+        super(opts.message);
+        this.name = "HttpRetryError";
+        this.class = opts.class;
+        this.status = opts.status;
+        this.attempts = opts.attempts;
+        this.cause = opts.cause;
+      }
+    };
+    AbortRunError = class extends HttpRetryError {
+      constructor(opts) {
+        super({
+          message: opts.message,
+          class: "abort",
+          status: opts.status,
+          attempts: 1,
+          cause: opts.cause
+        });
+        this.name = "AbortRunError";
+      }
+    };
+    DEFAULT_RETRY_POLICY = {
+      maxAttempts: 3,
+      baseMs: 1e3,
+      maxBackoffMs: 3e4,
+      taskTimeoutMs: 6e4
+    };
+  }
+});
+
 // src/commands/google-analysis/normalize-impression-shares.ts
 function normalizeShareValue(value, competitiveMetrics, field) {
   const cmVal = competitiveMetrics?.[field];
@@ -101399,6 +101543,28 @@ var init_translate_fields = __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 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 };
+}
+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/commands/google-analysis/fetch.ts
 function defaultDateRange3() {
   const end = /* @__PURE__ */ new Date();
@@ -101432,9 +101598,19 @@ function buildSearchParams(def, start, end, extras) {
   const s = params.toString();
   return s ? `?${s}` : "";
 }
-async function fetchJson(config, pathWithQuery, verbose) {
+async function fetchGoogleAnalysisHttp(label, factory, http2) {
+  return fetchWithRetry(factory, {
+    label,
+    policy: { ...DEFAULT_RETRY_POLICY, ...http2?.retry },
+    signal: http2?.signal
+  });
+}
+async function fetchJson(config, pathWithQuery, verbose, label = pathWithQuery, http2) {
   const url = `${config.googleApiUrl}${pathWithQuery}`;
-  return apiFetch2(url, config, {}, verbose);
+  return fetchGoogleAnalysisHttp(label, () => apiFetch2(url, config, {}, verbose), http2);
+}
+async function fetchMainPlatformJson(url, config, verbose, label, http2) {
+  return fetchGoogleAnalysisHttp(label, () => apiFetch2(url, config, {}, verbose), http2);
 }
 function deviceBidModifierLookupKey(campaignId, adGroupId, deviceType) {
   return `${campaignId ?? ""}\0${adGroupId ?? ""}\0${deviceType ?? ""}`;
@@ -101482,54 +101658,55 @@ function rowsFromAccountDailyReportsEnvelope(raw, mediaCustomerId) {
   const list = block?.data;
   return Array.isArray(list) ? list : [];
 }
-async function fetchGoogleAnalysisSectionJson(config, fullPath, verbose, name2) {
+async function fetchGoogleAnalysisSectionJson(config, fullPath, verbose, name2, label, http2) {
+  const fetchSection = () => fetchJson(config, fullPath, verbose, label, http2);
   switch (name2) {
     case "overview":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "keywords":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "search-terms":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "campaigns":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "campaign-hour":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "ads":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "extensions":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "devices":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "geographic":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "geo-matched":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "campaign-geo":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "campaign-geo-matched":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "campaign-device":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "audience":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "asset-images":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "videos":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "resource-counts":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "conversion-actions":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "gold-account":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "ads-index":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "final-urls":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "dimension-summary":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     case "campaign-types":
-      return fetchJson(config, fullPath, verbose);
+      return fetchSection();
     default:
       return assertNever(name2, "google-analysis");
   }
@@ -101544,7 +101721,7 @@ function manifestDateRange(def, start, end) {
   const { startDate, endDate } = resolveDateRange2(start, end);
   return { mode: "range", start: startDate, end: endDate };
 }
-async function fetchSectionPayload(def, opts, config, id) {
+async function fetchSectionPayload(def, opts, config, id, http2) {
   const extras = {};
   if (def.keywordOptions) {
     if (typeof opts.limit === "number" && opts.limit > 0) {
@@ -101571,9 +101748,10 @@ async function fetchSectionPayload(def, opts, config, id) {
     const q = `?${new URLSearchParams({ startDate, endDate }).toString()}`;
     const videoPath = `/reporting/media-account/${id}/Videos${q}`;
     const imagePath = `/reporting/media-account/${id}/CampaignAssetView${q}`;
+    const verbose = !!opts.verbose;
     const [images, videos] = await Promise.all([
-      fetchJson(config, imagePath, !!opts.verbose),
-      fetchJson(config, videoPath, !!opts.verbose)
+      fetchJson(config, imagePath, verbose, `materials/images/${id}`, http2),
+      fetchJson(config, videoPath, verbose, `materials/videos/${id}`, http2)
     ]);
     const merged = { images, videos };
     return annotateZhFields(
@@ -101587,12 +101765,21 @@ async function fetchSectionPayload(def, opts, config, id) {
   if (def.name === "campaign-device") {
     const sectionPath2 = def.path(id);
     const query2 = buildSearchParams(def, opts.start, opts.end, extras);
+    const verbose = !!opts.verbose;
     const [report, modifiers] = await Promise.all([
-      fetchJson(config, `${sectionPath2}${query2}`, !!opts.verbose),
+      fetchJson(
+        config,
+        `${sectionPath2}${query2}`,
+        verbose,
+        `campaign-device/${id}`,
+        http2
+      ),
       fetchJson(
         config,
         `/campaignmanagement/${id}/BidModifiers/Devices`,
-        !!opts.verbose
+        verbose,
+        `campaign-device/bid-modifiers/${id}`,
+        http2
       )
     ]);
     const data2 = mergeDeviceBidModifiersIntoReport(report, modifiers);
@@ -101606,13 +101793,20 @@ async function fetchSectionPayload(def, opts, config, id) {
   }
   if (def.name === "daily-metrics") {
     const { startDate, endDate } = resolveDateRange2(opts.start, opts.end);
+    const { startInstant, endInstant } = resolveDailyMetricsQueryTimes(startDate, endDate);
     const params = new URLSearchParams({
       mediaCustomerIds: id,
-      startDate: `${startDate}T00:00:00+08:00`,
-      endDate: `${endDate}T23:59:59+08:00`
+      startDate: startInstant,
+      endDate: endInstant
     });
     const url = `${config.apiBaseUrl}/report/media-account/google/account-daily-reports?${params.toString()}`;
-    const raw = await apiFetch2(url, config, {}, !!opts.verbose);
+    const raw = await fetchMainPlatformJson(
+      url,
+      config,
+      !!opts.verbose,
+      `daily-metrics/${id}`,
+      http2
+    );
     const rows = rowsFromAccountDailyReportsEnvelope(raw, id);
     return annotateZhFields(
       normalizeMoneyScales(
@@ -101628,7 +101822,9 @@ async function fetchSectionPayload(def, opts, config, id) {
     config,
     `${sectionPath}${query}`,
     !!opts.verbose,
-    def.name
+    def.name,
+    `${def.name}/${id}`,
+    http2
   );
   let payload = stripLegacyGoogleFieldsIfV2Present(data);
   payload = normalizeRateScales(payload, def.name);
@@ -101665,7 +101861,8 @@ async function fetchOneGoogleSection(opts) {
       conversionsGreater: opts.conversionsGreater
     },
     opts.config,
-    opts.accountId
+    opts.accountId,
+    { retry: opts.retry, signal: opts.signal }
   );
   return {
     payload,
@@ -101679,156 +101876,14 @@ var init_fetch = __esm({
     "use strict";
     init_auth();
     init_strip_legacy_google_fields();
+    init_http_retry();
     init_sections();
     init_normalize_impression_shares();
     init_normalize_rates();
     init_normalize_money();
     init_normalize_overview();
     init_translate_fields();
-  }
-});
-
-// src/utils/http-retry.ts
-function classifyError(err) {
-  const status = parseHttpStatusFromError(err);
-  if (status === 401) return { class: "abort", status };
-  if (status === void 0) {
-    return { class: "retryable" };
-  }
-  if (status === 408 || status === 429) return { class: "retryable", status };
-  if (status >= 500 && status <= 599) return { class: "retryable", status };
-  if (status >= 400 && status <= 499) return { class: "permanent", status };
-  return { class: "permanent", status };
-}
-function computeBackoffMs(attempt, policy) {
-  const exp = policy.baseMs * 2 ** Math.max(0, attempt - 1);
-  const capped = Math.min(exp, policy.maxBackoffMs);
-  const jitter = Math.floor(Math.random() * policy.baseMs);
-  return capped + jitter;
-}
-function sleep3(ms, signal) {
-  return new Promise((resolve15, reject) => {
-    if (signal?.aborted) {
-      reject(new Error("retry sleep aborted"));
-      return;
-    }
-    const timer = setTimeout(() => {
-      signal?.removeEventListener("abort", onAbort);
-      resolve15();
-    }, ms);
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(new Error("retry sleep aborted"));
-    };
-    signal?.addEventListener("abort", onAbort, { once: true });
-  });
-}
-async function withTaskTimeout(factory, timeoutMs, label) {
-  if (!timeoutMs || timeoutMs <= 0) return factory();
-  let timer;
-  try {
-    return await Promise.race([
-      factory(),
-      new Promise((_, reject) => {
-        timer = setTimeout(() => {
-          reject(new Error(`\u8BF7\u6C42\u8D85\u65F6\uFF08${(timeoutMs / 1e3).toFixed(0)} \u79D2\uFF09\uFF1A${label}`));
-        }, timeoutMs);
-      })
-    ]);
-  } finally {
-    if (timer) clearTimeout(timer);
-  }
-}
-async function fetchWithRetry(factory, options) {
-  const policy = { ...DEFAULT_RETRY_POLICY, ...options.policy ?? {} };
-  let lastErr;
-  let lastStatus;
-  for (let attempt = 1; attempt <= policy.maxAttempts; attempt++) {
-    if (options.signal?.aborted) {
-      throw new AbortRunError({
-        message: `\u4EFB\u52A1\u88AB\u5916\u90E8\u4FE1\u53F7\u4E2D\u6B62\uFF1A${options.label}`
-      });
-    }
-    try {
-      return await withTaskTimeout(factory, policy.taskTimeoutMs, options.label);
-    } catch (raw) {
-      const err = raw instanceof Error ? raw : new Error(String(raw));
-      const cls = classifyError(err);
-      lastErr = err;
-      lastStatus = cls.status;
-      if (cls.class === "abort") {
-        throw new AbortRunError({
-          message: `Token \u5931\u6548\u6216\u81F4\u547D\u9519\u8BEF\uFF08${options.label}\uFF09\uFF1A${err.message}`,
-          status: cls.status,
-          cause: err
-        });
-      }
-      if (cls.class === "permanent" || attempt >= policy.maxAttempts) {
-        throw new HttpRetryError({
-          message: cls.class === "permanent" ? `\u6C38\u4E45\u5931\u8D25\uFF08${options.label}\uFF09\uFF1A${err.message}` : `\u91CD\u8BD5 ${attempt} \u6B21\u4ECD\u5931\u8D25\uFF08${options.label}\uFF09\uFF1A${err.message}`,
-          class: cls.class === "permanent" ? "permanent" : "retryable",
-          status: cls.status,
-          attempts: attempt,
-          cause: err
-        });
-      }
-      const backoffMs = computeBackoffMs(attempt, policy);
-      options.onRetry?.({ attempt, backoffMs, status: cls.status, error: err });
-      try {
-        await sleep3(backoffMs, options.signal);
-      } catch {
-        throw new AbortRunError({
-          message: `\u91CD\u8BD5\u7B49\u5F85\u88AB\u4E2D\u6B62\uFF1A${options.label}`,
-          cause: err
-        });
-      }
-    }
-  }
-  throw new HttpRetryError({
-    message: `\u672A\u77E5\u91CD\u8BD5\u5931\u8D25\uFF08${options.label}\uFF09\uFF1A${lastErr?.message ?? "no error"}`,
-    class: "retryable",
-    status: lastStatus,
-    attempts: policy.maxAttempts,
-    cause: lastErr
-  });
-}
-var HttpRetryError, AbortRunError, DEFAULT_RETRY_POLICY;
-var init_http_retry = __esm({
-  "src/utils/http-retry.ts"() {
-    "use strict";
-    init_dist();
-    HttpRetryError = class extends Error {
-      class;
-      status;
-      attempts;
-      cause;
-      constructor(opts) {
-        super(opts.message);
-        this.name = "HttpRetryError";
-        this.class = opts.class;
-        this.status = opts.status;
-        this.attempts = opts.attempts;
-        this.cause = opts.cause;
-      }
-    };
-    AbortRunError = class extends HttpRetryError {
-      constructor(opts) {
-        super({
-          message: opts.message,
-          class: "abort",
-          status: opts.status,
-          attempts: 1,
-          cause: opts.cause
-        });
-        this.name = "AbortRunError";
-      }
-    };
-    DEFAULT_RETRY_POLICY = {
-      maxAttempts: 3,
-      baseMs: 1e3,
-      maxBackoffMs: 3e4,
-      taskTimeoutMs: 6e4
-    };
+    init_daily_metrics_range();
   }
 });
 
@@ -102260,24 +102315,19 @@ async function runBatch(opts) {
         await recordTaskTransition(opts.paths, inner, task, "running", { attempts: 0 });
         const t0 = performance2.now();
         try {
-          const result = await fetchWithRetry(
-            () => fetcher({
-              config: opts.config,
-              accountId: task.accountId,
-              section: task.section,
-              start: opts.start,
-              end: opts.end,
-              limit: opts.keywordLimit,
-              costGreater: opts.campaignGeoCostGreater,
-              clickGreater: opts.campaignGeoClickGreater,
-              conversionsGreater: opts.campaignGeoConversionsGreater
-            }),
-            {
-              label: `${task.section}/${task.accountId}`,
-              policy: opts.retry,
-              signal: aborterToken.signal
-            }
-          );
+          const result = await fetcher({
+            config: opts.config,
+            accountId: task.accountId,
+            section: task.section,
+            start: opts.start,
+            end: opts.end,
+            limit: opts.keywordLimit,
+            costGreater: opts.campaignGeoCostGreater,
+            clickGreater: opts.campaignGeoClickGreater,
+            conversionsGreater: opts.campaignGeoConversionsGreater,
+            retry: opts.retry,
+            signal: aborterToken.signal
+          });
           await writer({
             snapshotDir: path25.join(opts.paths.resultsDir, sanitizeAccountSegment(task.accountId)),
             section: task.section,
@@ -103046,6 +103096,51 @@ async function runWithConcurrency(tasks, concurrency) {
   await Promise.all(workers);
   return results;
 }
+function sectionFetchErrorMessage(err) {
+  return err instanceof Error ? err.message : String(err);
+}
+async function fetchAndWriteSection(def, opts, config, id, cliVersion) {
+  const t0 = performance4.now();
+  try {
+    const { payload } = await fetchOneGoogleSection({
+      config,
+      accountId: id,
+      section: def.name,
+      start: opts.start,
+      end: opts.end,
+      verbose: opts.verbose,
+      limit: opts.limit,
+      noOrderByCost: opts.noOrderByCost,
+      level: opts.level,
+      audienceType: opts.audienceType,
+      costGreater: opts.costGreater,
+      clickGreater: opts.clickGreater,
+      conversionsGreater: opts.conversionsGreater
+    });
+    const summary = await writeGoogleAnalysisSnapshot({
+      snapshotDir: opts.jsonOut,
+      section: def.name,
+      accountId: id,
+      dateRange: manifestDateRange(def, opts.start, opts.end),
+      payload,
+      cliVersion,
+      endpointHint: endpointHintForSection(def)
+    });
+    return {
+      section: def.name,
+      ok: true,
+      elapsedMs: performance4.now() - t0,
+      file: summary.writtenFiles[0]
+    };
+  } catch (err) {
+    return {
+      section: def.name,
+      ok: false,
+      elapsedMs: performance4.now() - t0,
+      error: sectionFetchErrorMessage(err)
+    };
+  }
+}
 async function runAllSections(opts) {
   const config = loadConfig(opts.token);
   const id = opts.account.split(",")[0].trim();
@@ -103070,35 +103165,20 @@ async function runAllSections(opts) {
   );
   const cliVersion = getCurrentVersion2();
   const overallT0 = performance4.now();
-  const tasks = targets.map((def) => async () => {
-    const t0 = performance4.now();
-    try {
-      const payload = await fetchSectionPayload(def, opts, config, id);
-      const summary2 = await writeGoogleAnalysisSnapshot({
-        snapshotDir: opts.jsonOut,
-        section: def.name,
-        accountId: id,
-        dateRange: manifestDateRange(def, opts.start, opts.end),
-        payload,
-        cliVersion,
-        endpointHint: endpointHintForSection(def)
-      });
-      return {
-        section: def.name,
-        ok: true,
-        elapsedMs: performance4.now() - t0,
-        file: summary2.writtenFiles[0]
-      };
-    } catch (err) {
-      return {
-        section: def.name,
-        ok: false,
-        elapsedMs: performance4.now() - t0,
-        error: err instanceof Error ? err.message : String(err)
-      };
+  const tasks = targets.map(
+    (def) => () => fetchAndWriteSection(def, opts, config, id, cliVersion)
+  );
+  let results = await runWithConcurrency(tasks, concurrency);
+  const failedIndices = results.map((r, i) => r.ok ? -1 : i).filter((i) => i >= 0);
+  if (failedIndices.length > 0) {
+    console.error(`
+\u26A0\uFE0F  ${failedIndices.length} \u4E2A\u7EF4\u5EA6\u9996\u8F6E\u5931\u8D25\uFF0C\u4E32\u884C\u4E8C\u8F6E\u91CD\u8BD5\u2026
+`);
+    for (const i of failedIndices) {
+      const retry = await fetchAndWriteSection(targets[i], opts, config, id, cliVersion);
+      if (retry.ok) results = [...results.slice(0, i), retry, ...results.slice(i + 1)];
     }
-  });
-  const results = await runWithConcurrency(tasks, concurrency);
+  }
   const succeeded = results.filter((r) => r.ok).length;
   const failed = results.length - succeeded;
   const absoluteSnapshotDir = path27.resolve(opts.jsonOut);
@@ -126276,43 +126356,51 @@ async function runGoogleAdsDiagnosisCollect(opts) {
   }
   const snapDir = path22.resolve(opts.jsonOut);
   await fs17.mkdir(snapDir, { recursive: true });
-  if (!opts.skipFetch) {
-    console.error(`
+  let degraded = false;
+  console.error(`
 \u{1F4E5} google-analysis \u62C9\u6570\uFF1A\u8D26\u6237 ${accountId}\uFF0C${opts.start} ~ ${opts.end}
 `);
-    const main = invokeGoogleAnalysisCli({
+  const main = invokeGoogleAnalysisCli({
+    account: accountId,
+    start: opts.start,
+    end: opts.end,
+    jsonOut: snapDir,
+    token: opts.token,
+    verbose: opts.verbose
+  });
+  const mainPartial = !main.ok && main.status === 2;
+  if (!main.ok && !mainPartial) {
+    console.error(main.stderr || main.stdout);
+    console.error("\n\u274C google-analysis \u62C9\u6570\u5931\u8D25\u3002\n");
+    process.exit(main.status || 1);
+  }
+  if (mainPartial) {
+    console.error(main.stderr || main.stdout);
+    console.error(
+      "\n\u26A0\uFE0F  google-analysis \u90E8\u5206\u7EF4\u5EA6\u62C9\u53D6\u5931\u8D25\uFF0C\u5C06\u7EE7\u7EED\u62C9\u53D6\u5BF9\u6BD4\u5468\u671F\u5E76\u751F\u6210 collect\u3002\n"
+    );
+    degraded = true;
+  }
+  if (opts.fetchPreviousPeriod !== false) {
+    const prev = previousDateRange2(opts.start, opts.end);
+    console.error(
+      `
+\u{1F4E5} \u62C9\u53D6\u5BF9\u6BD4\u5468\u671F campaigns/geographic/keywords\uFF1A${prev.start} ~ ${prev.end}
+`
+    );
+    const prevRun = invokeGoogleAnalysisCli({
       account: accountId,
-      start: opts.start,
-      end: opts.end,
+      start: prev.start,
+      end: prev.end,
       jsonOut: snapDir,
+      sections: "campaigns,geographic,keywords",
       token: opts.token,
       verbose: opts.verbose
     });
-    if (!main.ok) {
-      console.error(main.stderr || main.stdout);
-      console.error("\n\u274C google-analysis \u62C9\u6570\u5931\u8D25\u3002\n");
-      process.exit(main.status || 1);
-    }
-    if (opts.fetchPreviousPeriod !== false) {
-      const prev = previousDateRange2(opts.start, opts.end);
-      console.error(
-        `
-\u{1F4E5} \u62C9\u53D6\u5BF9\u6BD4\u5468\u671F campaigns/geographic/keywords\uFF1A${prev.start} ~ ${prev.end}
-`
-      );
-      const prevRun = invokeGoogleAnalysisCli({
-        account: accountId,
-        start: prev.start,
-        end: prev.end,
-        jsonOut: snapDir,
-        sections: "campaigns,geographic,keywords",
-        token: opts.token,
-        verbose: opts.verbose
-      });
-      if (!prevRun.ok) {
-        console.error(prevRun.stderr || prevRun.stdout);
-        console.error("\n\u26A0\uFE0F  \u4E0A\u4E00\u5468\u671F\u5BF9\u6BD4\u7EF4\u5EA6\u62C9\u53D6\u5931\u8D25\uFF0C\u73AF\u6BD4\u5217\u53EF\u80FD\u4E3A\u7A7A\u3002\n");
-      }
+    if (!prevRun.ok) {
+      console.error(prevRun.stderr || prevRun.stdout);
+      console.error("\n\u26A0\uFE0F  \u4E0A\u4E00\u5468\u671F\u5BF9\u6BD4\u7EF4\u5EA6\u62C9\u53D6\u5931\u8D25\uFF0C\u73AF\u6BD4\u5217\u53EF\u80FD\u4E3A\u7A7A\u3002\n");
+      degraded = true;
     }
   }
   const websiteUrl = await resolveWebsiteUrl(opts, snapDir, accountId);
@@ -126364,6 +126452,7 @@ async function runGoogleAdsDiagnosisCollect(opts) {
     `   \u7EC8\u7A3F\uFF1Asiluzan-tso google-ads-diagnosis render --data ${path22.join(snapDir, GOOGLE_ADS_DIAGNOSIS_REPORT_BASENAME)}
 `
   );
+  if (degraded) process.exit(2);
 }
 
 // src/commands/google-ads-diagnosis/render-report.ts
@@ -126707,7 +126796,7 @@ function registerGoogleAdsDiagnosisCommands(program2) {
   ).requiredOption("-a, --account <id>", "Google mediaCustomerId").requiredOption("--start <date>", "\u8BCA\u65AD\u5F00\u59CB\u65E5\u671F YYYY-MM-DD").requiredOption("--end <date>", "\u8BCA\u65AD\u7ED3\u675F\u65E5\u671F YYYY-MM-DD").option("--company-name <name>", "\u8D26\u6237\u540D\u79F0\uFF08\u9ED8\u8BA4\u4ECE list-accounts \u5FEB\u7167\u8BFB\u53D6\uFF09").option("--website <url>", "\u5B98\u7F51 URL\uFF08\u9ED8\u8BA4\u4ECE ads \u5FEB\u7167 finalurl \u8BFB\u53D6\uFF09").option(
     "--json-out <dir>",
     "\u843D\u76D8\u76EE\u5F55\uFF08google-analysis \u5FEB\u7167 + google-ads-diagnosis-collect.json\uFF09"
-  ).option("--skip-fetch", "\u4EC5\u6620\u5C04\u76EE\u5F55\u5185\u5DF2\u6709 google-analysis \u5FEB\u7167\uFF0C\u4E0D\u53D1\u8D77 API \u8BF7\u6C42").option("--skip-landing-page", "\u4E0D\u62C9\u53D6 WebsiteDiagnosisReports/performance").option("--no-fetch-previous-period", "\u4E0D\u62C9\u4E0A\u4E00\u5468\u671F campaigns/geographic/keywords \u5BF9\u6BD4\u6570\u636E").option("--token <token>", "JWT").option("--verbose", "\u6253\u5370\u8BF7\u6C42\u8BE6\u60C5").action(
+  ).option("--skip-landing-page", "\u4E0D\u62C9\u53D6 WebsiteDiagnosisReports/performance").option("--no-fetch-previous-period", "\u4E0D\u62C9\u4E0A\u4E00\u5468\u671F campaigns/geographic/keywords \u5BF9\u6BD4\u6570\u636E").option("--token <token>", "JWT").option("--verbose", "\u6253\u5370\u8BF7\u6C42\u8BE6\u60C5").action(
     async (opts) => {
       if (!opts.jsonOut?.trim()) {
         console.error("\n\u274C collect \u987B\u6307\u5B9A --json-out <\u76EE\u5F55>\u3002\n");
@@ -126720,7 +126809,6 @@ function registerGoogleAdsDiagnosisCommands(program2) {
         companyName: opts.companyName,
         website: opts.website,
         jsonOut: opts.jsonOut,
-        skipFetch: opts.skipFetch,
         skipLandingPage: opts.skipLandingPage,
         fetchPreviousPeriod: opts.fetchPreviousPeriod,
         token: opts.token,

package/dist/skill/_meta.json

@@ -1,5 +1,5 @@
 {
   "slug": "siluzan-tso",
-  "version": "1.1.34-beta.4",
-  "publishedAt": 1782984153033
+  "version": "1.1.35-beta.1",
+  "publishedAt": 1783063300004
 }

package/dist/skill/references/core/playbooks.md

@@ -29,7 +29,7 @@
   1. 确认统计区间（规则见 conventions §五）。
   2. `list-accounts -m Google -k <mediaCustomerId> --json-out ./snap-p1`（取 `currencyCode`）。
   3. `stats -m Google -a <mediaCustomerId> --start <S> --end <D> --json-out ./snap-p1`。
-  4. `google-ads-diagnosis collect -a <mediaCustomerId> --start <S> --end <D> --json-out ./snap-p1`（含 `daily-metrics` 按日趋势；产出 `google-ads-diagnosis-collect.json`，**仅事实**）。
+  4. `google-ads-diagnosis collect -a <mediaCustomerId> --start <S> --end <D> --json-out ./snap-p1`（含对比周期 campaigns/geographic/keywords + `daily-metrics` 按日趋势；产出 `google-ads-diagnosis-collect.json`，**仅事实**）。部分维度失败（exit 2）时 collect 仍产出 JSON，**禁止**用 `--skip-fetch` 或脚本绕过 CLI 重映射快照。
   5. **outline 门禁**（若手写脚本读盘）：对**每个** section Read 其 `<section>-<accountId>_*.outline.txt` 确认字段树——字段名以 outline 为准。
   6. **Agent 撰写**：读 `google-ads-diagnosis-collect.json`（`reportData` + `agentBrief`）+ `google-ads-diagnosis.md`，填写全部 `analysis` / `suggestions` / `diagnosisOverview` / `summary` 等，保存 `google-ads-diagnosis.json`。
   7. **渲染终稿**：`google-ads-diagnosis render --data ./snap-p1/google-ads-diagnosis.json --out ./snap-p1/google-ads-diagnosis-report.html`（模板与 MarkAI `GoogleAdsDiagnosisReport.html` 一致）。

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

@@ -30,9 +30,22 @@ siluzan-tso google-ads-diagnosis render \
 
 | 子命令   | 说明                                                                 |
 | -------- | -------------------------------------------------------------------- |
-| `collect` | 拉 google-analysis + 可选 Lighthouse；输出 `google-ads-diagnosis-collect.json` |
+| `collect` | 拉 google-analysis + 对比周期 campaigns/geographic/keywords + 可选 Lighthouse；输出 `google-ads-diagnosis-collect.json` |
 | `render`  | 读取 Agent 产出的 `google-ads-diagnosis.json`，注入 `GoogleAdsDiagnosisReport.html` |
 
+**collect 选项**：
+
+| 选项 | 说明 |
+| ---- | ---- |
+| `--no-fetch-previous-period` | 不拉上一周期 campaigns/geographic/keywords 对比数据（环比列将为空） |
+| `--skip-landing-page` | 不拉取 WebsiteDiagnosisReports/performance |
+
+**collect 行为约束**：
+
+- **禁止**使用已移除的 `--skip-fetch`；环比对比数据须由 CLI 向 API 拉取上一周期快照（`campaigns/geographic/keywords` 的 `*_YYYYMMDD-YYYYMMDD.json`），不可仅靠目录内当期快照映射。
+- `google-analysis` **部分维度失败**（exit 2，如 `daily-metrics` HTTP 400）时，collect **仍会继续**拉取对比周期并生成 `google-ads-diagnosis-collect.json`；Agent 可基于 collect 继续撰写，缺失维度在报告中注明。
+- 若环比列全为 `null`，检查落盘目录是否存在上一周期文件（如 `campaigns-<id>_20260503-20260602.json`）；不存在则**重新执行 collect**（勿用手动拼装或 Python 脚本绕过 CLI）。
+
 - **render 自动合并（默认开启）**：若同目录存在 `google-ads-diagnosis-collect.json`，且 Agent 改坏了 `campaigns` / `geographic` / `keywords` 的 `items`（缺 `title`/`currentCost` 或环比写成字符串），CLI **自动从 collect.reportData 恢复 items**，保留 Agent 的 `analysis`/`suggestions`。可用 `--no-merge-collect` 关闭；`--collect <file>` 指定 collect 路径。
 - **render 硬校验**：合并后对比表仍不完整则 **exit 1**（避免 HTML 表体全空）。
 

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

@@ -30,9 +30,22 @@ siluzan-tso google-ads-diagnosis render \
 
 | 子命令   | 说明                                                                 |
 | -------- | -------------------------------------------------------------------- |
-| `collect` | 拉 google-analysis + 可选 Lighthouse；输出 `google-ads-diagnosis-collect.json` |
+| `collect` | 拉 google-analysis + 对比周期 campaigns/geographic/keywords + 可选 Lighthouse；输出 `google-ads-diagnosis-collect.json` |
 | `render`  | 读取 Agent 产出的 `google-ads-diagnosis.json`，注入 `GoogleAdsDiagnosisReport.html` |
 
+**collect 选项**：
+
+| 选项 | 说明 |
+| ---- | ---- |
+| `--no-fetch-previous-period` | 不拉上一周期 campaigns/geographic/keywords 对比数据（环比列将为空） |
+| `--skip-landing-page` | 不拉取 WebsiteDiagnosisReports/performance |
+
+**collect 行为约束**：
+
+- **禁止**使用已移除的 `--skip-fetch`；环比对比数据须由 CLI 向 API 拉取上一周期快照（`campaigns/geographic/keywords` 的 `*_YYYYMMDD-YYYYMMDD.json`），不可仅靠目录内当期快照映射。
+- `google-analysis` **部分维度失败**（exit 2，如 `daily-metrics` HTTP 400）时，collect **仍会继续**拉取对比周期并生成 `google-ads-diagnosis-collect.json`；Agent 可基于 collect 继续撰写，缺失维度在报告中注明。
+- 若环比列全为 `null`，检查落盘目录是否存在上一周期文件（如 `campaigns-<id>_20260503-20260602.json`）；不存在则**重新执行 collect**（勿用手动拼装或 Python 脚本绕过 CLI）。
+
 - **render 自动合并（默认开启）**：若同目录存在 `google-ads-diagnosis-collect.json`，且 Agent 改坏了 `campaigns` / `geographic` / `keywords` 的 `items`（缺 `title`/`currentCost` 或环比写成字符串），CLI **自动从 collect.reportData 恢复 items**，保留 Agent 的 `analysis`/`suggestions`。可用 `--no-merge-collect` 关闭；`--collect <file>` 指定 collect 路径。
 - **render 硬校验**：合并后对比表仍不完整则 **exit 1**（避免 HTML 表体全空）。
 

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