siluzan-tso-cli 1.1.34 → 1.1.35-beta.2

package/dist/index.js

@@ -3829,7 +3829,7 @@ var DEFAULT_API_BASE;
 var init_defaults = __esm({
   "src/config/defaults.ts"() {
     "use strict";
-    DEFAULT_API_BASE = "https://tso-api.siluzan.com";
+    DEFAULT_API_BASE = "https://tso-api-ci.siluzan.com";
   }
 });
 
@@ -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);
@@ -124804,12 +124884,11 @@ import path18 from "path";
 // src/commands/market-analysis/report-content.ts
 var SILUZAN_ECHARTS_CDN_URL = "https://staticpn.siluzan.com/assets/slz/homeCDN/echarts.js";
 var MARKET_REPORT_DIMENSIONS = [
-  // ── 封面与元信息 ──
   {
     id: "cover",
     chapter: "\u5C01\u9762",
-    dimension: "\u62A5\u544A\u6807\u9898\u542B\u5BA2\u6237\u4E0E\u76EE\u6807\u5E02\u573A",
-    hint: "\u987B\u542B\u300C\u6218\u7565\u5E02\u573A\u5206\u6790\u300D\u6216\u300CKA\u5BA2\u6237\u300D\u53CA\u76EE\u6807\u5E02\u573A\u5173\u952E\u8BCD"
+    dimension: "\u62A5\u544A\u6807\u9898\u542B\u6218\u7565/\u884C\u4E1A/\u5E02\u573A\u5206\u6790\u6807\u8BC6",
+    hint: "\u987B\u542B\u300C\u6218\u7565\u5E02\u573A\u5206\u6790\u300D\u300C\u884C\u4E1A\u5206\u6790\u62A5\u544A\u300D\u300C\u5E02\u573A\u5206\u6790\u62A5\u544A\u300D\u6216\u300C\u884C\u4E1A\u8C03\u67E5\u300D\u7B49"
   },
   {
     id: "cover-kpi",
@@ -124817,7 +124896,6 @@ var MARKET_REPORT_DIMENSIONS = [
     dimension: "\u6838\u5FC3\u7ED3\u8BBA\u6216 KPI \u6458\u8981",
     hint: "\u5C01\u9762\u987B\u6709\u53EF\u626B\u8BFB\u7684\u7ED3\u8BBA\u6BB5\u6216 metric \u5361\u7247\uFF0C\u975E\u4EC5\u6807\u9898"
   },
-  // ── 一、市场与趋势诊断 ──
   {
     id: "ch1",
     chapter: "\u4E00\u3001\u5E02\u573A\u4E0E\u8D8B\u52BF\u8BCA\u65AD",
@@ -124840,7 +124918,7 @@ var MARKET_REPORT_DIMENSIONS = [
     id: "ch1-target-geo",
     chapter: "\u4E00\u3001\u5E02\u573A\u4E0E\u8D8B\u52BF\u8BCA\u65AD",
     dimension: "\u76EE\u6807\u5E02\u573A\u56FD\u5BB6/\u533A\u57DF\u62C6\u89E3",
-    hint: "\u987B\u6309\u56FD\u5BB6\u6216\u533A\u57DF\u5BF9\u6BD4\u89C4\u6A21\u3001\u589E\u957F\u3001\u4F18\u5148\u7EA7\uFF08\u8868\u683C\u6216\u5206\u6BB5\uFF09"
+    hint: "\u987B\u6309\u56FD\u5BB6\u6216\u533A\u57DF\u5BF9\u6BD4\u89C4\u6A21\u3001\u589E\u957F\u3001\u4F18\u5148\u7EA7\uFF08\u8868\u683C\u6216\u5206\u6BB5\uFF09\uFF1B\u4E0E collect \u76EE\u6807\u5E02\u573A\u4E00\u81F4\u66F4\u4F73"
   },
   {
     id: "ch1-pestel",
@@ -124854,7 +124932,6 @@ var MARKET_REPORT_DIMENSIONS = [
     dimension: "3\u20135 \u5E74\u8D8B\u52BF\u9884\u6D4B\u4E0E\u5047\u8BBE",
     hint: "\u987B\u542B\u300C\u9884\u6D4B\u300D\u6216\u300C3\u300D\u5E74/\u300C5\u300D\u5E74\u8D8B\u52BF\u8868\u8FF0"
   },
-  // ── 二、目标行业深度洞察 ──
   {
     id: "ch2",
     chapter: "\u4E8C\u3001\u76EE\u6807\u884C\u4E1A\u6DF1\u5EA6\u6D1E\u5BDF",
@@ -124871,7 +124948,7 @@ var MARKET_REPORT_DIMENSIONS = [
     id: "ch2-compliance",
     chapter: "\u4E8C\u3001\u76EE\u6807\u884C\u4E1A\u6DF1\u5EA6\u6D1E\u5BDF",
     dimension: "\u6CD5\u89C4\u73AF\u5883\u4E0E\u5408\u89C4\u8981\u6C42",
-    hint: "\u987B\u542B\u6CD5\u89C4/\u5408\u89C4\u8868\uFF0C\u542B\u5E94\u5BF9\u7B56\u7565\uFF1B\u5B9C\u542B\u5408\u89C4\u6EA2\u4EF7\u6216\u6210\u672C\u4F30\u7B97"
+    hint: "\u987B\u542B\u6CD5\u89C4/\u5408\u89C4\u8868\uFF0C\u542B\u5E94\u5BF9\u7B56\u7565\uFF1B\u5B9C\u542B\u5408\u89C4\u6210\u672C\u6216\u6EA2\u4EF7\u4F30\u7B97"
   },
   {
     id: "ch2-bpmn",
@@ -124879,7 +124956,6 @@ var MARKET_REPORT_DIMENSIONS = [
     dimension: "\u5178\u578B\u573A\u666F\u4E0E BPMN \u6D41\u7A0B\u5BF9\u6BD4",
     hint: "\u987B\u542B\u300C\u539F\u6D41\u7A0B\u300D\u4E0E\u300C\u65B0\u6D41\u7A0B\u300D\u6216 BPMN \u6587\u672C + \u6548\u7387/\u6210\u672C\u91CF\u5316"
   },
-  // ── 三、目标受众与场景 ──
   {
     id: "ch3",
     chapter: "\u4E09\u3001\u76EE\u6807\u53D7\u4F17\u4E0E\u573A\u666F",
@@ -124898,7 +124974,6 @@ var MARKET_REPORT_DIMENSIONS = [
     dimension: "\u4EA7\u54C1\u5E94\u7528\u573A\u666F\u4E0E\u4EF7\u503C\u5206\u6790",
     hint: "\u987B\u542B\u5E94\u7528\u573A\u666F\u3001\u5DEE\u5F02\u5316\u3001\u7528\u6237\u4EF7\u503C\u4E0E\u4F01\u4E1A\u4EF7\u503C"
   },
-  // ── 四、竞争策略与定位 ──
   {
     id: "ch4",
     chapter: "\u56DB\u3001\u7ADE\u4E89\u7B56\u7565\u4E0E\u5B9A\u4F4D",
@@ -124909,13 +124984,13 @@ var MARKET_REPORT_DIMENSIONS = [
     id: "ch4-competitors",
     chapter: "\u56DB\u3001\u7ADE\u4E89\u7B56\u7565\u4E0E\u5B9A\u4F4D",
     dimension: "\u4E3B\u8981\u7ADE\u54C1\u8BC6\u522B",
-    hint: "\u987B\u70B9\u540D \u22653 \u4E2A\u7ADE\u54C1\u6216\u5BF9\u6807\u54C1\u724C"
+    hint: "\u987B\u70B9\u540D \u22653 \u4E2A\u7ADE\u54C1\u6216\u5BF9\u6807\u4F01\u4E1A\uFF08\u4E0D\u9650\u5B9A\u884C\u4E1A\u54C1\u724C\uFF09"
   },
   {
     id: "ch4-compare-table",
     chapter: "\u56DB\u3001\u7ADE\u4E89\u7B56\u7565\u4E0E\u5B9A\u4F4D",
-    dimension: "\u529F\u80FD\u4E0E\u6027\u80FD\u5BF9\u6BD4\u8868\uFF08\u226510 \u9879 \xD7 \u22653 \u7ADE\u54C1\uFF09",
-    hint: "\u987B\u6709\u7ADE\u54C1\u5BF9\u6BD4\u8868\uFF0C\u884C\u6570\u5145\u8DB3\uFF08\u5EFA\u8BAE \u226510 \u884C\u7EF4\u5EA6\uFF09"
+    dimension: "\u529F\u80FD\u4E0E\u6027\u80FD\u5BF9\u6BD4\u8868\uFF08\u226510 \u9879 \xD7 \u22653 \u4E3B\u4F53\uFF09",
+    hint: "\u987B\u6709\u7ADE\u54C1\u5BF9\u6BD4\u8868\uFF1A\u22654 \u5217\uFF08\u7EF4\u5EA6+\u591A\u65B9\uFF09\u4E14 \u226511 \u884C"
   },
   {
     id: "ch4-gaps",
@@ -124929,7 +125004,6 @@ var MARKET_REPORT_DIMENSIONS = [
     dimension: "\u6838\u5FC3\u5B9A\u4F4D\u9648\u8FF0\u4E0E\u5DEE\u5F02\u5316\u7EF4\u5EA6",
     hint: "\u987B\u6709\u4E00\u53E5\u5B9A\u4F4D\u9648\u8FF0 + \u591A\u4E2A\u5DEE\u5F02\u5316\u7EF4\u5EA6"
   },
-  // ── 五、增长与品牌策略 ──
   {
     id: "ch5",
     chapter: "\u4E94\u3001\u589E\u957F\u4E0E\u54C1\u724C\u7B56\u7565",
@@ -124954,7 +125028,6 @@ var MARKET_REPORT_DIMENSIONS = [
     dimension: "\u8425\u9500\u4E0E\u9500\u552E\u6218\u672F",
     hint: "\u987B\u542B\u5185\u5BB9\u8425\u9500/\u6E20\u9053/KOL/\u9500\u552E\u6A21\u5F0F\u7B49\u6218\u672F\u63CF\u8FF0"
   },
-  // ── 六、实施、资源与风险 ──
   {
     id: "ch6",
     chapter: "\u516D\u3001\u5B9E\u65BD\u3001\u8D44\u6E90\u4E0E\u98CE\u9669",
@@ -124979,7 +125052,6 @@ var MARKET_REPORT_DIMENSIONS = [
     dimension: "\u98CE\u9669\u77E9\u9635\u4E0E\u5E94\u5BF9\u7B56\u7565",
     hint: "\u987B\u542B\u5E02\u573A/\u7ADE\u4E89/\u6280\u672F/\u8FD0\u8425\u7B49\u98CE\u9669 + \u6BCF\u7C7B\u5E94\u5BF9\u63AA\u65BD"
   },
-  // ── 附录 ──
   {
     id: "appendix",
     chapter: "\u9644\u5F55",
@@ -125004,7 +125076,6 @@ var MARKET_REPORT_DIMENSIONS = [
     dimension: "\u672F\u8BED\u8868\uFF08ROI/CAGR/GTM/BPMN \u7B49\uFF09",
     hint: "\u987B\u89E3\u91CA\u81F3\u5C11 3 \u4E2A\u7F29\u5199"
   },
-  // ── 呈现规范（原始 prompt HTML 要求）──
   {
     id: "viz-echarts",
     chapter: "\u5448\u73B0",
@@ -125018,6 +125089,44 @@ var MARKET_REPORT_DIMENSIONS = [
     hint: "\u987B\u542B Source: \u6216\u300C\u6765\u6E90\u300D\u811A\u6CE8"
   }
 ];
+function stripHtmlTags(html) {
+  return html.replace(/<script[\s\S]*?<\/script>/gi, " ").replace(/<style[\s\S]*?<\/style>/gi, " ").replace(/<[^>]+>/g, " ");
+}
+function countTableColumns(tableHtml) {
+  const firstRow = tableHtml.match(/<tr[\s\S]*?<\/tr>/i)?.[0] ?? "";
+  const th = (firstRow.match(/<th/gi) ?? []).length;
+  const td = (firstRow.match(/<td/gi) ?? []).length;
+  return Math.max(th, td);
+}
+function isCompareTable(tableHtml, html, tableIndex) {
+  const inTable = /对比|竞品|功能|性能|维度|指标|参数/.test(tableHtml);
+  if (inTable) return true;
+  const windowStart = Math.max(0, tableIndex - 600);
+  const windowEnd = Math.min(html.length, tableIndex + tableHtml.length + 400);
+  const nearby = html.slice(windowStart, windowEnd);
+  return /对比|竞品|竞争|功能|性能|对标/.test(nearby);
+}
+function findFeatureCompareTableRows(html) {
+  const tables = html.match(/<table[\s\S]*?<\/table>/gi) ?? [];
+  let best = 0;
+  let searchFrom = 0;
+  for (const t of tables) {
+    const tableIndex = html.indexOf(t, searchFrom);
+    searchFrom = tableIndex + 1;
+    if (countTableColumns(t) < 4) continue;
+    if (!isCompareTable(t, html, tableIndex)) continue;
+    const rows = (t.match(/<tr/gi) ?? []).length;
+    if (rows > best) best = rows;
+  }
+  return best;
+}
+function countPainPoints(html) {
+  const labeled = (html.match(/痛点\s*\d/gi) ?? []).length;
+  if (labeled >= 4) return labeled;
+  const section = html.match(/痛点[\s\S]{0,3000}/i)?.[0] ?? html;
+  const listItems = (section.match(/<li[^>]*>/gi) ?? []).length;
+  return Math.max(labeled, listItems >= 4 ? 4 : listItems);
+}
 function countEchartsInstances(html) {
   const inits = (html.match(/echarts\.init\(/g) ?? []).length;
   if (inits > 0) return inits;
@@ -125026,67 +125135,97 @@ function countEchartsInstances(html) {
 function hasEchartsCdn(html) {
   return /homeCDN\/echarts\.js|echarts\.min\.js|npm\/echarts@/i.test(html);
 }
-function countPainPoints(html) {
-  const labeled = (html.match(/痛点\s*\d/g) ?? []).length;
-  if (labeled >= 4) return labeled;
-  const section = html.match(/痛点[\s\S]{0,3000}/)?.[0] ?? html;
-  const listItems = (section.match(/<li[^>]*>/g) ?? []).length;
-  return Math.max(labeled, listItems >= 4 ? 4 : listItems);
-}
-function competitorCompareTableRows(html) {
-  const tables = html.match(/<table[\s\S]*?<\/table>/g) ?? [];
-  let best = 0;
-  for (const t of tables) {
-    const hasSelf = /小米|我方|客户/.test(t);
-    const rivalHits = ["Apple", "Samsung", "Google", "\u82F9\u679C", "\u4E09\u661F", "\u8C37\u6B4C", "\u534E\u4E3A"].filter(
-      (b) => t.includes(b)
-    ).length;
-    if (!hasSelf || rivalHits < 2) continue;
-    const rows = (t.match(/<tr/g) ?? []).length;
-    if (rows > best) best = rows;
-  }
-  return best;
-}
-function mentionsCompetitors(html) {
-  const brands = ["Apple", "Samsung", "Google", "\u82F9\u679C", "\u4E09\u661F", "\u8C37\u6B4C", "\u534E\u4E3A", "Motorola"];
-  let n = 0;
-  for (const b of brands) {
-    if (html.includes(b)) n++;
+function countCompetitorMentions(html) {
+  const competitorSection = html.match(/(?:主要)?竞品[\s\S]{0,5000}/i)?.[0] ?? html.match(/竞争对手[\s\S]{0,5000}/i)?.[0] ?? html.match(/对标(?:企业|品牌|公司)[\s\S]{0,5000}/i)?.[0] ?? "";
+  if (competitorSection) {
+    const listItems = (competitorSection.match(/<li[^>]*>[\s\S]*?<\/li>/gi) ?? []).filter(
+      (li) => stripHtmlTags(li).trim().length >= 2
+    );
+    if (listItems.length >= 3) return listItems.length;
+    const inlineList = competitorSection.match(/(?:竞品|竞争对手|对标)[：:][\s\S]{0,800}/i)?.[0];
+    if (inlineList) {
+      const parts = stripHtmlTags(inlineList).split(/[、,，；;|]/).map((s) => s.replace(/^(竞品|竞争对手|对标)[：:]/, "").trim()).filter((s) => s.length >= 2);
+      if (parts.length >= 3) return parts.length;
+    }
+    const plain = stripHtmlTags(competitorSection);
+    const entities = plain.match(
+      /[\u4e00-\u9fa5A-Za-z0-9&][\u4e00-\u9fa5A-Za-z0-9&.\- ]{1,30}(?:公司|集团|Co\.|Corp|Inc|Ltd|品牌)?/g
+    );
+    if (entities && new Set(entities.map((e) => e.trim())).size >= 3) {
+      return new Set(entities.map((e) => e.trim())).size;
+    }
   }
-  return n >= 3;
+  const tables = html.match(/<table[\s\S]*?<\/table>/gi) ?? [];
+  let searchFrom = 0;
+  for (const t of tables) {
+    const tableIndex = html.indexOf(t, searchFrom);
+    searchFrom = tableIndex + 1;
+    const cols = countTableColumns(t);
+    if (cols >= 4 && isCompareTable(t, html, tableIndex)) {
+      return Math.max(3, cols - 1);
+    }
+  }
+  const globalPlain = stripHtmlTags(html);
+  const named = globalPlain.match(
+    /(?:竞品|竞争对手)[：:][^\n。；;]{10,400}/
+  )?.[0] ?? "";
+  if (named) {
+    const parts = named.replace(/^[^：:]+[：:]/, "").split(/[、,，；;|]/).map((s) => s.trim()).filter((s) => s.length >= 2);
+    if (parts.length >= 3) return parts.length;
+  }
+  return 0;
+}
+function splitMarketTokens(value) {
+  return value.split(/[、,，/|]/).map((t) => t.trim()).filter((t) => t.length >= 2);
+}
+function hasTargetGeoBreakdown(html, ctx) {
+  const hasMetrics = /规模|增长|优先级|潜力|份额|CAGR|市场容量/.test(html);
+  const hasGeoFrame = /国家|区域|地区|市场/.test(html);
+  if (!hasMetrics || !hasGeoFrame) return false;
+  const targetMarket = ctx.targetMarket?.trim() ?? "";
+  if (targetMarket) {
+    if (/全球|国际|worldwide/i.test(targetMarket)) {
+      return /全球|国际|各区域|分区域|分市场/.test(html);
+    }
+    const tokens = splitMarketTokens(targetMarket);
+    const hit = tokens.filter((t) => html.includes(t)).length;
+    if (hit >= 1) return true;
+  }
+  const regionHits = (html.match(
+    /(?:亚太|欧洲|北美|拉美|中东|非洲|东南亚|全球|[\u4e00-\u9fa5]{2,8}(?:市场|地区|国家|区域))/g
+  ) ?? []).length;
+  return regionHits >= 2;
+}
+function hasReportTitle(html, ctx) {
+  const hasTitle = /战略市场分析|KA客户|行业分析报告|市场分析报告|行业调查|市场调查/.test(html);
+  if (!hasTitle) return false;
+  return /目标市场|全球市场|行业|细分|market/i.test(html) || !!ctx.targetMarket?.trim() || !!ctx.industry?.trim() || !!ctx.customerName?.trim();
 }
 var CONTENT_RULES = [
-  {
-    id: "cover",
-    test: (h) => /战略市场分析|KA客户/.test(h) && (/目标市场|北美|全球|欧洲|亚太/.test(h) || /targetMarket/i.test(h))
-  },
-  { id: "cover-kpi", test: (h) => /核心结论|metric|kpi|结论/.test(h) },
+  { id: "cover", test: (h, ctx) => hasReportTitle(h, ctx) },
+  { id: "cover-kpi", test: (h) => /核心结论|metric|kpi|结论|摘要|executive summary/i.test(h) },
   { id: "ch1", test: (h) => /市场与趋势诊断/.test(h) },
   {
     id: "ch1-tam",
     test: (h) => (/TAM|SAM|SOM/.test(h) || /市场规模/.test(h)) && /CAGR|增长率|增长趋势/.test(h)
   },
   { id: "ch1-value-chain", test: (h) => /价值链|生态定位|产业链/.test(h) },
-  {
-    id: "ch1-target-geo",
-    test: (h) => (/美国|加拿大|墨西哥|中国|欧洲/.test(h) || /国家|区域/.test(h)) && /增长|规模|优先级|潜力/.test(h)
-  },
-  { id: "ch1-pestel", test: (h) => /PESTEL|政策|法规环境|技术趋势/.test(h) },
+  { id: "ch1-target-geo", test: (h, ctx) => hasTargetGeoBreakdown(h, ctx) },
+  { id: "ch1-pestel", test: (h) => /PESTEL|政策|法规环境|技术趋势|经济|社会|环境/.test(h) },
   { id: "ch1-forecast", test: (h) => /预测|3.?5年|未来\d/.test(h) },
   { id: "ch2", test: (h) => /行业深度洞察|目标行业/.test(h) },
   { id: "ch2-pain", test: (h, ctx) => ctx.painPointCount >= 4 },
-  { id: "ch2-compliance", test: (h) => /法规|合规|FCC|隐私/.test(h) && /<table/.test(h) },
+  { id: "ch2-compliance", test: (h) => /法规|合规/.test(h) && /<table/.test(h) },
   {
     id: "ch2-bpmn",
-    test: (h) => /原流程|BPMN|介入后|新流程/.test(h) && /效率|成本|提升|下降/.test(h)
+    test: (h) => /原流程|BPMN|介入后|新流程/.test(h) && /效率|成本|提升|下降|节约/.test(h)
   },
   { id: "ch3", test: (h) => /目标受众|受众与场景/.test(h) },
   { id: "ch3-audience", test: (h) => /用户|受众|画像|群体/.test(h) && /<table/.test(h) },
   { id: "ch3-scenario", test: (h) => /应用场景|场景|差异化|用户价值|企业价值/.test(h) },
   { id: "ch4", test: (h) => /竞争策略|竞争.{0,6}定位/.test(h) },
-  { id: "ch4-competitors", test: (h) => mentionsCompetitors(h) },
-  // 表头 1 行 + ≥10 项维度 ≈ ≥11 个 <tr>
-  { id: "ch4-compare-table", test: (h) => competitorCompareTableRows(h) >= 11 },
+  { id: "ch4-competitors", test: (h, ctx) => ctx.competitorCount >= 3 },
+  { id: "ch4-compare-table", test: (h, ctx) => ctx.competitorTableRows >= 11 },
   {
     id: "ch4-gaps",
     test: (h) => [
@@ -125115,11 +125254,22 @@ var CONTENT_RULES = [
   { id: "viz-echarts", test: (h, ctx) => hasEchartsCdn(h) && ctx.chartCount >= 1 },
   { id: "viz-source", test: (h) => /Source:|来源：|来源:/.test(h) }
 ];
-function validateMarketReportContent(html) {
+function validationContextFromReport(data) {
+  const customerInfo = data.customerInfo && typeof data.customerInfo === "object" && !Array.isArray(data.customerInfo) ? data.customerInfo : {};
+  return {
+    targetMarket: String(data.targetMarket ?? customerInfo.targetMarket ?? "").trim() || void 0,
+    industry: String(customerInfo.industry ?? "").trim() || void 0,
+    customerName: String(customerInfo.customerName ?? "").trim() || void 0
+  };
+}
+function validateMarketReportContent(html, reportContext) {
   const ctx = {
-    tableCount: (html.match(/<table/g) ?? []).length,
+    ...reportContext,
+    tableCount: (html.match(/<table/gi) ?? []).length,
     chartCount: countEchartsInstances(html),
-    painPointCount: countPainPoints(html)
+    painPointCount: countPainPoints(html),
+    competitorTableRows: findFeatureCompareTableRows(html),
+    competitorCount: countCompetitorMentions(html)
   };
   const dimById = new Map(MARKET_REPORT_DIMENSIONS.map((d) => [d.id, d]));
   const missing = [];
@@ -125142,7 +125292,7 @@ function validateMarketReportContent(html) {
       tables: ctx.tableCount,
       charts: ctx.chartCount,
       painPoints: ctx.painPointCount,
-      competitorTableRows: competitorCompareTableRows(html)
+      competitorTableRows: ctx.competitorTableRows
     }
   };
 }
@@ -125150,7 +125300,7 @@ function formatMarketReportContentErrors(result) {
   if (result.ok) return "";
   const lines = result.missing.map((m) => `  - [${m.chapter}] ${m.dimension}\uFF1A${m.hint}`);
   return [
-    `\u62A5\u544A\u7F3A\u5C11 ${result.missing.length} \u9879\u5FC5\u542B\u5185\u5BB9\uFF08\u5BF9\u9F50 TSO getMarketReport \u539F\u59CB\u4E1A\u52A1\u7EF4\u5EA6\uFF09\uFF1A`,
+    `\u62A5\u544A\u7F3A\u5C11 ${result.missing.length} \u9879\u5FC5\u542B\u5185\u5BB9\uFF08\u901A\u7528\u884C\u4E1A\u8C03\u67E5\u7EF4\u5EA6\uFF09\uFF1A`,
     ...lines,
     "",
     "\u8BF7 Read assets/market-analysis-rules.md\u300C\u539F\u59CB\u4E1A\u52A1\u7EF4\u5EA6\u6E05\u5355\u300D\uFF0CWebSearch \u8865\u5168\u7F3A\u5931\u7AE0\u8282\u540E\u91CD\u5199 market-report.json\u3002"
@@ -125200,7 +125350,8 @@ async function runMarketAnalysisRender(opts) {
     console.error("\n\u274C \u62A5\u544A HTML \u5185\u5BB9\u4E3A\u7A7A\n");
     process.exit(1);
   }
-  const contentCheck = validateMarketReportContent(html);
+  const reportData = asRecord4(dataRaw);
+  const contentCheck = validateMarketReportContent(html, validationContextFromReport(reportData));
   if (!contentCheck.ok) {
     console.error(`
 \u274C ${formatMarketReportContentErrors(contentCheck)}
@@ -126276,43 +126427,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 +126523,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 +126867,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 +126880,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,