siluzan-tso-cli 1.1.22-beta.12 → 1.1.22-beta.14

package/README.md

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

package/dist/index.js

@@ -2262,13 +2262,13 @@ function redactSensitive(input) {
 }
 async function apiFetch(url, config, options = {}, verbose = false) {
   const method = options.method ?? "GET";
-  const authHeaders = config.apiKey ? { "x-api-key": config.apiKey } : { Authorization: `Bearer ${config.authToken}` };
+  const authHeaders2 = config.apiKey ? { "x-api-key": config.apiKey } : { Authorization: `Bearer ${config.authToken}` };
   const reqHeaders = {
     "Content-Type": "application/json",
     "Accept-Language": "zh-CN",
     // 声明支持 gzip/deflate/br；服务端不支持则按 identity 返回，rawRequest 会原样收取
     "Accept-Encoding": "gzip, deflate, br",
-    ...authHeaders,
+    ...authHeaders2,
     // dataPermission 仅 TSO 使用；CSO 未设置时为空字符串，服务端忽略该头
     Datapermission: config.dataPermission ?? "",
     ...options.headers ?? {}
@@ -2296,12 +2296,12 @@ async function apiFetch(url, config, options = {}, verbose = false) {
 }
 async function apiFetchWithHeaders(url, config, options = {}, verbose = false) {
   const method = options.method ?? "GET";
-  const authHeaders = config.apiKey ? { "x-api-key": config.apiKey } : { Authorization: `Bearer ${config.authToken}` };
+  const authHeaders2 = config.apiKey ? { "x-api-key": config.apiKey } : { Authorization: `Bearer ${config.authToken}` };
   const reqHeaders = {
     "Content-Type": "application/json",
     "Accept-Language": "zh-CN",
     "Accept-Encoding": "gzip, deflate, br",
-    ...authHeaders,
+    ...authHeaders2,
     Datapermission: config.dataPermission ?? "",
     ...options.headers ?? {}
   };
@@ -2616,14 +2616,14 @@ function parseMeResponse(text) {
 async function fetchSiluzanCurrentUser(apiBase, config) {
   const mainOrigin = deriveMainApiOrigin(apiBase);
   const meUrl = `${mainOrigin.replace(/\/$/, "")}/query/account/me`;
-  const authHeaders = config.apiKey ? { "x-api-key": config.apiKey } : { Authorization: `Bearer ${config.authToken}` };
+  const authHeaders2 = config.apiKey ? { "x-api-key": config.apiKey } : { Authorization: `Bearer ${config.authToken}` };
   try {
     const res = await rawRequest(meUrl, {
       method: "GET",
       headers: {
         "Content-Type": "application/json",
         "Accept-Language": "zh-CN",
-        ...authHeaders
+        ...authHeaders2
       }
     });
     if (res.status < 200 || res.status >= 300) return null;
@@ -100904,15 +100904,15 @@ function computeBackoffMs(attempt, policy) {
   const jitter = Math.floor(Math.random() * policy.baseMs);
   return capped + jitter;
 }
-function sleep2(ms, signal) {
-  return new Promise((resolve12, reject) => {
+function sleep3(ms, signal) {
+  return new Promise((resolve13, reject) => {
     if (signal?.aborted) {
       reject(new Error("retry sleep aborted"));
       return;
     }
     const timer = setTimeout(() => {
       signal?.removeEventListener("abort", onAbort);
-      resolve12();
+      resolve13();
     }, ms);
     const onAbort = () => {
       clearTimeout(timer);
@@ -100973,7 +100973,7 @@ async function fetchWithRetry(factory, options) {
       const backoffMs = computeBackoffMs(attempt, policy);
       options.onRetry?.({ attempt, backoffMs, status: cls.status, error: err });
       try {
-        await sleep2(backoffMs, options.signal);
+        await sleep3(backoffMs, options.signal);
       } catch {
         throw new AbortRunError({
           message: `\u91CD\u8BD5\u7B49\u5F85\u88AB\u4E2D\u6B62\uFF1A${options.label}`,
@@ -113852,6 +113852,10 @@ function runPmaxCreateValidation(cfg) {
       }
     }
   }
+  const youtube = cfg.youtubeUrlOrId?.trim();
+  if (youtube && youtube.length < 6) {
+    pushErr3(errors, "youtubeUrlOrId \u8FC7\u77ED\uFF0C\u8BF7\u586B\u5199\u5B8C\u6574 YouTube URL \u6216 11 \u4F4D\u89C6\u9891 ID");
+  }
   validateTextLengths(
     errors,
     lengthViolations,
@@ -114319,8 +114323,129 @@ function assertPmaxImageSlotsResolved(slots) {
   }
 }
 
-// src/commands/ad/pmax-load.ts
+// src/commands/ad/pmax-shared.ts
+init_auth();
+init_cli_json_snapshot();
 import { readFileSync as readFileSync6 } from "fs";
+import { dirname as dirname9, isAbsolute as isAbsolute4, resolve as resolve8 } from "path";
+var PMAX_MONEY_KEYS = /* @__PURE__ */ new Set(["budget", "targetCpa_BidingAmount"]);
+function loadPmaxJsonFile(configFile) {
+  let raw;
+  try {
+    raw = JSON.parse(readFileSync6(configFile, "utf8"));
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : String(e);
+    console.error(`
+\u274C \u8BFB\u53D6 JSON \u5931\u8D25\uFF08${configFile}\uFF09\uFF1A${msg}
+`);
+    process.exit(1);
+  }
+  return stripMetaKeys(raw);
+}
+function resolvePmaxImagePath2(configFile, relOrAbs) {
+  const trimmed = relOrAbs.trim();
+  if (isAbsolute4(trimmed)) return trimmed;
+  return resolve8(dirname9(configFile), trimmed);
+}
+function convertPmaxMoneyInObject(body) {
+  const out = { ...body };
+  for (const key of PMAX_MONEY_KEYS) {
+    const val = out[key];
+    if (typeof val === "number" && Number.isFinite(val)) {
+      out[key] = toCentAmount(val);
+    }
+  }
+  return out;
+}
+function buildPmaxAssetGroupApiBody(cfg, imageSlots) {
+  assertPmaxImageSlotsResolved(imageSlots);
+  return {
+    name: cfg.name.trim(),
+    finalUrls: cfg.finalUrls.map((u) => u.trim()).filter(Boolean),
+    headlines: cfg.headlines.map((h) => h.trim()).filter(Boolean),
+    longHeadlines: cfg.longHeadlines.map((h) => h.trim()).filter(Boolean),
+    descriptions: cfg.descriptions.map((d) => d.trim()).filter(Boolean),
+    businessName: cfg.businessName.trim(),
+    ...imageSlots
+  };
+}
+async function processAssetsUpdateBodyWithUpload(configFile, body, accountId, config, googleApiUrl, verbose) {
+  const out = { ...body };
+  const links = out["assetsToLink"];
+  if (!Array.isArray(links)) return out;
+  out["assetsToLink"] = await Promise.all(
+    links.map(async (item) => {
+      if (!item || typeof item !== "object") return item;
+      const row = { ...item };
+      const imagePath = row["imagePath"];
+      if (typeof imagePath === "string" && imagePath.trim()) {
+        const abs = resolvePmaxImagePath2(configFile, imagePath);
+        row["assetId"] = await uploadPmaxImageFile(
+          config,
+          googleApiUrl,
+          accountId,
+          abs,
+          void 0,
+          verbose
+        );
+        delete row["imagePath"];
+        delete row["imageBase64"];
+      }
+      return row;
+    })
+  );
+  return out;
+}
+async function withGoogleApi(opts, fn) {
+  const config = await ensureDataPermission(loadConfig(opts.token));
+  const googleApiUrl = requireGoogleApi(config);
+  return fn(config, googleApiUrl);
+}
+async function pmaxApiFetch(url, config, init, verbose) {
+  return apiFetch2(url, config, init ?? {}, verbose);
+}
+async function postPmaxYoutubeLink(opts) {
+  const body = {
+    youtubeUrlOrId: opts.youtubeUrlOrId.trim()
+  };
+  if (opts.campaignId?.trim()) body["campaignId"] = opts.campaignId.trim();
+  if (opts.assetName?.trim()) body["assetName"] = opts.assetName.trim();
+  const url = pmaxAssetGroupUrl(
+    opts.googleApiUrl,
+    opts.accountId,
+    opts.assetGroupId,
+    "youtube"
+  );
+  const raw = await pmaxApiFetch(
+    url,
+    opts.config,
+    { method: "POST", body: JSON.stringify(body) },
+    opts.verbose
+  );
+  return raw && typeof raw === "object" && !Array.isArray(raw) ? raw : { data: raw };
+}
+async function emitPmaxResult(opts, section, commandLabel, payload, idSuffix) {
+  return emitCliJsonOrSnapshot(opts, {
+    section,
+    commandLabel,
+    commandHint: idSuffix ?? opts.account ?? "",
+    payload,
+    idSuffix: idSuffix ?? opts.account
+  });
+}
+function requireAccountId(account, label = "-a, --account") {
+  const id = account?.toString().trim();
+  if (!id) {
+    console.error(`
+\u274C \u8BF7\u6307\u5B9A\u5A92\u4F53\u8D26\u6237 ID\uFF08${label}\uFF09
+`);
+    process.exit(1);
+  }
+  return id;
+}
+
+// src/commands/ad/pmax-load.ts
+import { readFileSync as readFileSync7 } from "fs";
 function loadPmaxCreateConfig(configFile) {
   const cfg = tryLoadPmaxCreateConfig(configFile);
   if (!cfg) {
@@ -114331,15 +114456,36 @@ function loadPmaxCreateConfig(configFile) {
   }
   return cfg;
 }
+var DEPRECATED_PMAX_VIDEO_KEYS = ["videoPaths", "localVideo", "videoFile", "video"];
+function detectDeprecatedPmaxVideoKeys(raw) {
+  const msgs = [];
+  for (const key of DEPRECATED_PMAX_VIDEO_KEYS) {
+    const v = raw[key];
+    if (v == null) continue;
+    if (typeof v === "string" && !v.trim()) continue;
+    if (typeof v === "object" && !Array.isArray(v) && Object.keys(v).length === 0) {
+      continue;
+    }
+    msgs.push(`\u914D\u7F6E\u542B\u5DF2\u5E9F\u5F03\u5B57\u6BB5\u300C${key}\u300D\uFF0C\u8BF7\u6539\u7528 videoPath\uFF08\u672C\u5730\u6587\u4EF6\uFF09\u6216 youtubeUrlOrId`);
+  }
+  return msgs;
+}
 function tryLoadPmaxCreateConfig(configFile) {
   let raw;
   try {
-    raw = JSON.parse(readFileSync6(configFile, "utf8"));
+    raw = JSON.parse(readFileSync7(configFile, "utf8"));
   } catch {
     return null;
   }
   return stripMetaKeys(raw);
 }
+function loadPmaxCreateConfigRaw(configFile) {
+  try {
+    return stripMetaKeys(JSON.parse(readFileSync7(configFile, "utf8")));
+  } catch {
+    return null;
+  }
+}
 function parseLocationLanguageIds(items) {
   if (!items?.length) return void 0;
   return items.map((item) => ({
@@ -114381,9 +114527,182 @@ function buildPmaxCreateUrl(googleApiUrl, accountId) {
   return `${base}/accounts/${accountId}/campaign/pmax`;
 }
 
+// src/commands/ad/pmax-video-upload.ts
+import { existsSync as existsSync3, readFileSync as readFileSync8 } from "fs";
+import { basename as basename5, dirname as dirname10, isAbsolute as isAbsolute5, resolve as resolve9 } from "path";
+var VIDEO_UPLOAD_SUFFIX = /\.(mp4|mov|webm|avi|mpeg|mpg)$/i;
+var TERMINAL_VIDEO_STATES = /* @__PURE__ */ new Set(["PROCESSED", "FAILED", "REJECTED", "UNAVAILABLE", "NOT_FOUND"]);
+var FAILED_VIDEO_STATES = /* @__PURE__ */ new Set(["FAILED", "REJECTED", "UNAVAILABLE", "NOT_FOUND"]);
+var PMAX_VIDEO_POLL_INTERVAL_MS = 1e4;
+var PMAX_VIDEO_POLL_MAX_ATTEMPTS = 120;
+function pyapiVideoUploadUrl(googleApiUrl) {
+  const base = googleApiUrl.replace(/\/$/, "");
+  return `${base}/pyapi/video/upload`;
+}
+function pyapiVideoStatusUrl(googleApiUrl, mediaAccountId, resourceName) {
+  const base = googleApiUrl.replace(/\/$/, "");
+  const params = new URLSearchParams({
+    media_account_id: mediaAccountId.replace(/-/g, ""),
+    resource_name: resourceName
+  });
+  return `${base}/pyapi/video/upload/status?${params.toString()}`;
+}
+function resolveVideoPath(configFile, relOrAbs) {
+  const trimmed = relOrAbs.trim();
+  if (isAbsolute5(trimmed)) return trimmed;
+  return resolve9(dirname10(configFile), trimmed);
+}
+function authHeaders(config) {
+  const headers = {
+    "Accept-Language": "zh-CN",
+    Datapermission: config.dataPermission ?? ""
+  };
+  if (config.apiKey) headers["x-api-key"] = config.apiKey;
+  else headers.Authorization = `Bearer ${config.authToken}`;
+  return headers;
+}
+function guessVideoMimeType(fileName) {
+  const lower = fileName.toLowerCase();
+  if (lower.endsWith(".mp4")) return "video/mp4";
+  if (lower.endsWith(".mov")) return "video/quicktime";
+  if (lower.endsWith(".webm")) return "video/webm";
+  if (lower.endsWith(".avi")) return "video/x-msvideo";
+  if (lower.endsWith(".mpeg") || lower.endsWith(".mpg")) return "video/mpeg";
+  return "application/octet-stream";
+}
+function runPmaxVideoValidation(configFile, cfg) {
+  const errors = [];
+  const warnings = [];
+  const videoPath = cfg.videoPath?.trim();
+  const youtube = cfg.youtubeUrlOrId?.trim();
+  if (videoPath && youtube) {
+    errors.push("videoPath \u4E0E youtubeUrlOrId \u53EA\u80FD\u4E8C\u9009\u4E00\uFF08\u672C\u5730\u6587\u4EF6\u8D70 PyAPI \u4E0A\u4F20\uFF0C\u540E\u8005\u4E3A\u5DF2\u6709 YouTube\uFF09");
+    return { errors, warnings };
+  }
+  if (!videoPath) return { errors, warnings };
+  if (!VIDEO_UPLOAD_SUFFIX.test(videoPath)) {
+    errors.push(
+      `videoPath \u6269\u5C55\u540D\u4E0D\u53D7\u652F\u6301\uFF08${videoPath}\uFF09\uFF0C\u8BF7\u4F7F\u7528 .mp4 / .mov / .webm / .avi / .mpeg / .mpg`
+    );
+  }
+  const abs = resolveVideoPath(configFile, videoPath);
+  if (!existsSync3(abs)) {
+    errors.push(`videoPath \u6587\u4EF6\u4E0D\u5B58\u5728\uFF1A${abs}`);
+    return { errors, warnings };
+  }
+  try {
+    const buf = readFileSync8(abs);
+    if (buf.length === 0) errors.push(`videoPath \u4E3A\u7A7A\u6587\u4EF6\uFF1A${abs}`);
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : String(e);
+    errors.push(`\u65E0\u6CD5\u8BFB\u53D6 videoPath\uFF08${abs}\uFF09\uFF1A${msg}`);
+  }
+  if (!cfg.videoTitle?.trim()) {
+    warnings.push("\u672A\u8BBE\u7F6E videoTitle\uFF0C\u5C06\u4F7F\u7528\u6587\u4EF6\u540D\u4F5C\u4E3A YouTube \u4E0A\u4F20\u6807\u9898");
+  }
+  return { errors, warnings };
+}
+async function fetchVideoUploadStatus(config, googleApiUrl, mediaAccountId, resourceName, verbose) {
+  const url = pyapiVideoStatusUrl(googleApiUrl, mediaAccountId, resourceName);
+  const res = await fetch(url, { method: "GET", headers: authHeaders(config) });
+  const text = await res.text();
+  if (!res.ok) {
+    const detail = verbose ? `\uFF1A${text.slice(0, 300)}` : "";
+    throw new Error(`\u67E5\u8BE2\u89C6\u9891\u5904\u7406\u72B6\u6001 HTTP ${res.status}${detail}`);
+  }
+  try {
+    return JSON.parse(text);
+  } catch {
+    throw new Error("\u67E5\u8BE2\u89C6\u9891\u5904\u7406\u72B6\u6001\u54CD\u5E94\u975E JSON");
+  }
+}
+function sleep2(ms) {
+  return new Promise((r) => setTimeout(r, ms));
+}
+async function pollVideoUntilProcessed(config, googleApiUrl, mediaAccountId, resourceName, verbose, onProgress) {
+  for (let attempt = 1; attempt <= PMAX_VIDEO_POLL_MAX_ATTEMPTS; attempt++) {
+    const status = await fetchVideoUploadStatus(
+      config,
+      googleApiUrl,
+      mediaAccountId,
+      resourceName,
+      verbose
+    );
+    const state = (status.state ?? "UNKNOWN").toUpperCase();
+    onProgress?.(state, attempt);
+    if (status.video_id?.trim()) {
+      return status.video_id.trim();
+    }
+    if (FAILED_VIDEO_STATES.has(state)) {
+      throw new Error(`\u89C6\u9891\u5904\u7406\u5931\u8D25\uFF08state=${state}\uFF0Cresource=${resourceName}\uFF09`);
+    }
+    if (TERMINAL_VIDEO_STATES.has(state) && state === "PROCESSED" && !status.video_id) {
+      throw new Error(`\u89C6\u9891\u5DF2 PROCESSED \u4F46\u672A\u8FD4\u56DE video_id\uFF08resource=${resourceName}\uFF09`);
+    }
+    if (TERMINAL_VIDEO_STATES.has(state) && state !== "PROCESSED") {
+      throw new Error(`\u89C6\u9891\u5904\u7406\u7ED3\u675F\u4F46\u65E0 video_id\uFF08state=${state}\uFF09`);
+    }
+    if (attempt < PMAX_VIDEO_POLL_MAX_ATTEMPTS) {
+      await sleep2(PMAX_VIDEO_POLL_INTERVAL_MS);
+    }
+  }
+  throw new Error(
+    `\u7B49\u5F85\u89C6\u9891\u5904\u7406\u8D85\u65F6\uFF08\u5DF2\u8F6E\u8BE2 ${PMAX_VIDEO_POLL_MAX_ATTEMPTS} \u6B21\uFF0C\u7EA6 ${PMAX_VIDEO_POLL_MAX_ATTEMPTS * PMAX_VIDEO_POLL_INTERVAL_MS / 6e4} \u5206\u949F\uFF09`
+  );
+}
+async function uploadPmaxLocalVideo(opts) {
+  const fileName = basename5(opts.absVideoPath);
+  const title = (opts.title ?? fileName).trim() || fileName;
+  const description = (opts.description ?? "Uploaded via siluzan-tso PMax video upload").trim() || "Uploaded via siluzan-tso";
+  const fileBuffer = readFileSync8(opts.absVideoPath);
+  const form = new FormData();
+  form.append("media_account_id", opts.accountId.replace(/-/g, ""));
+  form.append("title", title);
+  form.append("description", description);
+  form.append("wait_for_processed", "false");
+  form.append(
+    "file",
+    new Blob([new Uint8Array(fileBuffer)], { type: guessVideoMimeType(fileName) }),
+    fileName
+  );
+  const url = pyapiVideoUploadUrl(opts.googleApiUrl);
+  const res = await fetch(url, { method: "POST", headers: authHeaders(opts.config), body: form });
+  const text = await res.text();
+  if (!res.ok) {
+    const detail = opts.verbose ? `\uFF1A${text.slice(0, 400)}` : "";
+    throw new Error(`\u4E0A\u4F20\u89C6\u9891 HTTP ${res.status}${detail}\uFF08${opts.absVideoPath}\uFF09`);
+  }
+  let data;
+  try {
+    data = JSON.parse(text);
+  } catch {
+    throw new Error(`\u4E0A\u4F20\u89C6\u9891\u54CD\u5E94\u975E JSON\uFF08${opts.absVideoPath}\uFF09`);
+  }
+  if (data.video_id?.trim()) {
+    return data.video_id.trim();
+  }
+  const resourceName = data.resource_name?.trim();
+  if (!resourceName) {
+    throw new Error(`\u4E0A\u4F20\u89C6\u9891\u672A\u8FD4\u56DE resource_name \u6216 video_id\uFF08${opts.absVideoPath}\uFF09`);
+  }
+  opts.onProgress?.(`\u5DF2\u4E0A\u4F20\uFF0C\u7B49\u5F85 Google \u5904\u7406\uFF08state=${data.state ?? "UPLOADED"}\uFF09\u2026`);
+  return pollVideoUntilProcessed(
+    opts.config,
+    opts.googleApiUrl,
+    opts.accountId,
+    resourceName,
+    opts.verbose,
+    (state, attempt) => {
+      opts.onProgress?.(`\u5904\u7406\u4E2D state=${state}\uFF08\u7B2C ${attempt}/${PMAX_VIDEO_POLL_MAX_ATTEMPTS} \u6B21\u67E5\u8BE2\uFF09`);
+    }
+  );
+}
+
 // src/commands/ad/pmax-create.ts
 async function runAdPmaxCreate(opts) {
   const cfg = loadPmaxCreateConfig(opts.configFile);
+  const rawCfg = loadPmaxCreateConfigRaw(opts.configFile) ?? {};
+  const deprecatedVideoKeys = detectDeprecatedPmaxVideoKeys(rawCfg);
   const {
     errors: cfgErrors,
     warnings: cfgWarnings,
@@ -114393,8 +114712,12 @@ async function runAdPmaxCreate(opts) {
     opts.configFile,
     cfg
   );
-  const errors = [...cfgErrors, ...imgErrors];
-  const warnings = [...cfgWarnings, ...imgWarnings];
+  const { errors: videoErrors, warnings: videoWarnings } = runPmaxVideoValidation(
+    opts.configFile,
+    cfg
+  );
+  const errors = [...deprecatedVideoKeys, ...cfgErrors, ...imgErrors, ...videoErrors];
+  const warnings = [...cfgWarnings, ...imgWarnings, ...videoWarnings];
   if (warnings.length > 0) {
     console.warn("\n\u26A0\uFE0F  PMax \u914D\u7F6E\u8B66\u544A\uFF08\u4E0D\u963B\u65AD\u63D0\u4EA4\uFF09\uFF1A");
     for (const w of warnings) console.warn(`   \u2022 ${w}`);
@@ -114464,6 +114787,65 @@ async function runAdPmaxCreate(opts) {
   const campaignId = data["campaignId"] ?? data["campaign_id"];
   const assetGroupId = data["assetGroupId"] ?? data["asset_group_id"];
   const budgetId = data["budgetId"] ?? data["budget_id"];
+  let youtubeTarget = cfg.youtubeUrlOrId?.trim();
+  const videoPath = cfg.videoPath?.trim();
+  if (videoPath && assetGroupId != null) {
+    const absVideo = resolvePmaxImagePath2(opts.configFile, videoPath);
+    if (!opts.jsonOut) console.log(`
+\u{1F4E4} \u4E0A\u4F20\u672C\u5730\u89C6\u9891\uFF08PyAPI\uFF09\u2026`);
+    try {
+      youtubeTarget = await uploadPmaxLocalVideo({
+        config,
+        googleApiUrl,
+        accountId,
+        absVideoPath: absVideo,
+        title: cfg.videoTitle,
+        description: cfg.videoDescription,
+        verbose: opts.verbose,
+        onProgress: opts.jsonOut ? void 0 : (msg) => console.log(`   ${msg}`)
+      });
+      if (!opts.jsonOut) console.log(`   video_id\uFF1A${youtubeTarget}`);
+    } catch (err) {
+      console.error(
+        `
+\u26A0\uFE0F  \u6D3B\u52A8\u5DF2\u521B\u5EFA\uFF0C\u4F46\u672C\u5730\u89C6\u9891\u4E0A\u4F20\u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}`
+      );
+      console.error(
+        `   \u53EF\u624B\u52A8\u4E0A\u4F20\u540E\u94FE\u63A5\uFF1Asiluzan-tso ad pmax-youtube-link -a ${accountId} --asset-group-id ${assetGroupId}` + (campaignId != null ? ` --campaign-id ${campaignId}` : "") + ` --youtube "<video_id>"
+`
+      );
+      youtubeTarget = void 0;
+    }
+  }
+  if (youtubeTarget && assetGroupId != null) {
+    try {
+      const yt = await postPmaxYoutubeLink({
+        config,
+        googleApiUrl,
+        accountId,
+        assetGroupId: String(assetGroupId),
+        youtubeUrlOrId: youtubeTarget,
+        campaignId: campaignId != null ? String(campaignId) : void 0,
+        assetName: cfg.youtubeAssetName,
+        verbose: opts.verbose
+      });
+      if (!opts.jsonOut) {
+        console.log(`
+\u2705 \u5DF2\u94FE\u63A5 YouTube\uFF1A${youtubeTarget}`);
+        const arn = yt["assetResourceName"];
+        if (arn != null) console.log(`   assetResourceName\uFF1A${arn}`);
+      }
+    } catch (err) {
+      console.error(
+        `
+\u26A0\uFE0F  \u6D3B\u52A8\u5DF2\u521B\u5EFA\uFF0C\u4F46 YouTube \u94FE\u63A5\u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}`
+      );
+      console.error(
+        `   \u8BF7\u624B\u52A8\u6267\u884C\uFF1Asiluzan-tso ad pmax-youtube-link -a ${accountId} --asset-group-id ${assetGroupId}` + (campaignId != null ? ` --campaign-id ${campaignId}` : "") + ` --youtube "${youtubeTarget}"
+`
+      );
+    }
+  }
   console.log("\n\u2705 PMax \u5E7F\u544A\u7CFB\u5217\u5DF2\u521B\u5EFA\uFF08\u540C\u6B65\uFF09");
   console.log(`   \u6D3B\u52A8\u540D\u79F0\uFF1A${cfg.name}`);
   if (campaignId != null) console.log(`   campaignId\uFF1A${campaignId}`);
@@ -114473,6 +114855,11 @@ async function runAdPmaxCreate(opts) {
     `
    \u590D\u6838\uFF1Asiluzan-tso ad campaigns -a ${accountId} --json-out  # channelTypeV2 \u5E94\u4E3A PERFORMANCE_MAX`
   );
+  if (!youtubeTarget && !videoPath) {
+    console.log(
+      "   \u89C6\u9891\uFF1A\u914D\u7F6E videoPath\uFF08\u672C\u5730\uFF09\u6216 youtubeUrlOrId \u53EF\u5728\u521B\u5EFA\u65F6\u81EA\u52A8\u94FE\u63A5\uFF1B\u6216\u521B\u5EFA\u540E ad pmax-youtube-link"
+    );
+  }
   console.log();
 }
 
@@ -114481,6 +114868,8 @@ import { writeFileSync as writeFileSync3 } from "fs";
 init_cli_json_snapshot();
 async function runAdPmaxValidate(opts) {
   const cfg = loadPmaxCreateConfig(opts.configFile);
+  const rawCfg = loadPmaxCreateConfigRaw(opts.configFile) ?? {};
+  const deprecatedVideoKeys = detectDeprecatedPmaxVideoKeys(rawCfg);
   const {
     errors: cfgErrors,
     warnings: cfgWarnings,
@@ -114490,8 +114879,12 @@ async function runAdPmaxValidate(opts) {
     opts.configFile,
     cfg
   );
-  const errors = [...cfgErrors, ...imgErrors];
-  const warnings = [...cfgWarnings, ...imgWarnings];
+  const { errors: videoErrors, warnings: videoWarnings } = runPmaxVideoValidation(
+    opts.configFile,
+    cfg
+  );
+  const errors = [...deprecatedVideoKeys, ...cfgErrors, ...imgErrors, ...videoErrors];
+  const warnings = [...cfgWarnings, ...imgWarnings, ...videoWarnings];
   const lengthViolations = cfgLengthViolations;
   if (opts.writeNormalized) {
     const toWrite = stripMetaKeysForExport(cfg);
@@ -114540,110 +114933,7 @@ async function runAdPmaxValidate(opts) {
 }
 
 // src/commands/ad/pmax-mgmt.ts
-import { basename as basename5, isAbsolute as isAbsolute5 } from "path";
-
-// src/commands/ad/pmax-shared.ts
-init_auth();
-init_cli_json_snapshot();
-import { readFileSync as readFileSync7 } from "fs";
-import { dirname as dirname9, isAbsolute as isAbsolute4, resolve as resolve8 } from "path";
-var PMAX_MONEY_KEYS = /* @__PURE__ */ new Set(["budget", "targetCpa_BidingAmount"]);
-function loadPmaxJsonFile(configFile) {
-  let raw;
-  try {
-    raw = JSON.parse(readFileSync7(configFile, "utf8"));
-  } catch (e) {
-    const msg = e instanceof Error ? e.message : String(e);
-    console.error(`
-\u274C \u8BFB\u53D6 JSON \u5931\u8D25\uFF08${configFile}\uFF09\uFF1A${msg}
-`);
-    process.exit(1);
-  }
-  return stripMetaKeys(raw);
-}
-function resolvePmaxImagePath2(configFile, relOrAbs) {
-  const trimmed = relOrAbs.trim();
-  if (isAbsolute4(trimmed)) return trimmed;
-  return resolve8(dirname9(configFile), trimmed);
-}
-function convertPmaxMoneyInObject(body) {
-  const out = { ...body };
-  for (const key of PMAX_MONEY_KEYS) {
-    const val = out[key];
-    if (typeof val === "number" && Number.isFinite(val)) {
-      out[key] = toCentAmount(val);
-    }
-  }
-  return out;
-}
-function buildPmaxAssetGroupApiBody(cfg, imageSlots) {
-  assertPmaxImageSlotsResolved(imageSlots);
-  return {
-    name: cfg.name.trim(),
-    finalUrls: cfg.finalUrls.map((u) => u.trim()).filter(Boolean),
-    headlines: cfg.headlines.map((h) => h.trim()).filter(Boolean),
-    longHeadlines: cfg.longHeadlines.map((h) => h.trim()).filter(Boolean),
-    descriptions: cfg.descriptions.map((d) => d.trim()).filter(Boolean),
-    businessName: cfg.businessName.trim(),
-    ...imageSlots
-  };
-}
-async function processAssetsUpdateBodyWithUpload(configFile, body, accountId, config, googleApiUrl, verbose) {
-  const out = { ...body };
-  const links = out["assetsToLink"];
-  if (!Array.isArray(links)) return out;
-  out["assetsToLink"] = await Promise.all(
-    links.map(async (item) => {
-      if (!item || typeof item !== "object") return item;
-      const row = { ...item };
-      const imagePath = row["imagePath"];
-      if (typeof imagePath === "string" && imagePath.trim()) {
-        const abs = resolvePmaxImagePath2(configFile, imagePath);
-        row["assetId"] = await uploadPmaxImageFile(
-          config,
-          googleApiUrl,
-          accountId,
-          abs,
-          void 0,
-          verbose
-        );
-        delete row["imagePath"];
-        delete row["imageBase64"];
-      }
-      return row;
-    })
-  );
-  return out;
-}
-async function withGoogleApi(opts, fn) {
-  const config = await ensureDataPermission(loadConfig(opts.token));
-  const googleApiUrl = requireGoogleApi(config);
-  return fn(config, googleApiUrl);
-}
-async function pmaxApiFetch(url, config, init, verbose) {
-  return apiFetch2(url, config, init ?? {}, verbose);
-}
-async function emitPmaxResult(opts, section, commandLabel, payload, idSuffix) {
-  return emitCliJsonOrSnapshot(opts, {
-    section,
-    commandLabel,
-    commandHint: idSuffix ?? opts.account ?? "",
-    payload,
-    idSuffix: idSuffix ?? opts.account
-  });
-}
-function requireAccountId(account, label = "-a, --account") {
-  const id = account?.toString().trim();
-  if (!id) {
-    console.error(`
-\u274C \u8BF7\u6307\u5B9A\u5A92\u4F53\u8D26\u6237 ID\uFF08${label}\uFF09
-`);
-    process.exit(1);
-  }
-  return id;
-}
-
-// src/commands/ad/pmax-mgmt.ts
+import { basename as basename6, isAbsolute as isAbsolute6 } from "path";
 function buildReportQuery(opts) {
   const params = new URLSearchParams();
   params.set("startDate", toGoogleDate(opts.startDate, -30).replace(/\//g, "-"));
@@ -114991,27 +115281,31 @@ async function runAdPmaxAssetsUpdate(opts) {
 async function runAdPmaxYoutubeLink(opts) {
   const accountId = requireAccountId(opts.account);
   const assetGroupId = opts.assetGroupId.trim();
-  let body;
-  if (opts.bodyFile) {
-    body = loadPmaxJsonFile(opts.bodyFile);
-  } else {
-    body = {
-      youtubeUrlOrId: opts.youtubeUrlOrId.trim()
-    };
-    if (opts.campaignId?.trim()) body["campaignId"] = opts.campaignId.trim();
-    if (opts.assetName?.trim()) body["assetName"] = opts.assetName.trim();
-  }
   await withGoogleApi(opts, async (config, googleApiUrl) => {
-    const url = pmaxAssetGroupUrl(googleApiUrl, accountId, assetGroupId, "youtube");
     let data;
     try {
-      const raw = await pmaxApiFetch(
-        url,
-        config,
-        { method: "POST", body: JSON.stringify(body) },
-        opts.verbose
-      );
-      data = raw && typeof raw === "object" && !Array.isArray(raw) ? raw : { data: raw };
+      if (opts.bodyFile) {
+        const url = pmaxAssetGroupUrl(googleApiUrl, accountId, assetGroupId, "youtube");
+        const body = loadPmaxJsonFile(opts.bodyFile);
+        const raw = await pmaxApiFetch(
+          url,
+          config,
+          { method: "POST", body: JSON.stringify(body) },
+          opts.verbose
+        );
+        data = raw && typeof raw === "object" && !Array.isArray(raw) ? raw : { data: raw };
+      } else {
+        data = await postPmaxYoutubeLink({
+          config,
+          googleApiUrl,
+          accountId,
+          assetGroupId,
+          youtubeUrlOrId: opts.youtubeUrlOrId,
+          campaignId: opts.campaignId,
+          assetName: opts.assetName,
+          verbose: opts.verbose
+        });
+      }
     } catch (err) {
       console.error(
         `
@@ -115202,8 +115496,8 @@ async function runAdPmaxImageUpload(opts) {
     let data;
     try {
       if (opts.imagePath?.trim()) {
-        const abs = isAbsolute5(opts.imagePath) ? opts.imagePath.trim() : resolvePmaxImagePath2(process.cwd(), opts.imagePath);
-        const name2 = (opts.name ?? basename5(abs)).trim();
+        const abs = isAbsolute6(opts.imagePath) ? opts.imagePath.trim() : resolvePmaxImagePath2(process.cwd(), opts.imagePath);
+        const name2 = (opts.name ?? basename6(abs)).trim();
         const id = await uploadPmaxImageFile(
           config,
           googleApiUrl,
@@ -115391,8 +115685,8 @@ async function runAdCampaignValidate(opts) {
 }
 
 // src/commands/ad/pmax-image-convert.ts
-import { mkdirSync as mkdirSync3, writeFileSync as writeFileSync5, readFileSync as readFileSync8, existsSync as existsSync3 } from "fs";
-import { resolve as resolve9, dirname as dirname10, basename as basename6, extname } from "path";
+import { mkdirSync as mkdirSync3, writeFileSync as writeFileSync5, readFileSync as readFileSync9, existsSync as existsSync4 } from "fs";
+import { resolve as resolve10, dirname as dirname11, basename as basename7, extname } from "path";
 var SPECS = [
   { kind: "marketing", width: 1200, height: 628, fit: "cover", suffix: "_marketing" },
   { kind: "square", width: 1200, height: 1200, fit: "cover", suffix: "_square" },
@@ -115439,9 +115733,9 @@ async function runAdPmaxImageConvert(opts) {
     (s) => s.kind === "logo" && opts.logoUseCover ? { ...s, fit: "cover" } : s
   );
   const firstInput = input ?? inputMarketing ?? inputSquare ?? inputLogo;
-  const outputDir = opts.outputDir ? resolve9(opts.outputDir) : dirname10(resolve9(firstInput));
+  const outputDir = opts.outputDir ? resolve10(opts.outputDir) : dirname11(resolve10(firstInput));
   mkdirSync3(outputDir, { recursive: true });
-  const prefix = opts.prefix ?? basename6(firstInput, extname(firstInput));
+  const prefix = opts.prefix ?? basename7(firstInput, extname(firstInput));
   const quality = opts.quality ?? 85;
   const sharpMod = await loadSharp();
   const sharpFn = (p) => sharpMod(p);
@@ -115453,15 +115747,15 @@ async function runAdPmaxImageConvert(opts) {
       console.warn(`\u26A0\uFE0F  ${spec.kind}\uFF1A\u672A\u6307\u5B9A\u8F93\u5165\u56FE\uFF0C\u8DF3\u8FC7`);
       continue;
     }
-    const absInput = resolve9(src);
-    if (!existsSync3(absInput)) {
+    const absInput = resolve10(src);
+    if (!existsSync4(absInput)) {
       console.error(`\u274C \u8F93\u5165\u6587\u4EF6\u4E0D\u5B58\u5728\uFF1A${absInput}`);
       hasError = true;
       continue;
     }
     const outExt = extname(absInput).toLowerCase() === ".png" ? ".png" : ".jpg";
     const outName = `${prefix}${spec.suffix}${outExt}`;
-    const absOutput = resolve9(outputDir, outName);
+    const absOutput = resolve10(outputDir, outName);
     try {
       await convertOne(sharpFn, absInput, absOutput, spec, quality);
       const sizeKB = Math.ceil(
@@ -115480,9 +115774,9 @@ async function runAdPmaxImageConvert(opts) {
     process.exit(1);
   }
   if (opts.updateConfig) {
-    const configPath = resolve9(opts.updateConfig);
+    const configPath = resolve10(opts.updateConfig);
     try {
-      const raw = JSON.parse(readFileSync8(configPath, "utf8"));
+      const raw = JSON.parse(readFileSync9(configPath, "utf8"));
       const imgPaths = raw["imagePaths"] ?? {};
       if (outputPaths.marketing) imgPaths["marketing"] = outputPaths.marketing;
       if (outputPaths.square) imgPaths["square"] = outputPaths.square;
@@ -115891,7 +116185,7 @@ function register20(program2) {
     }
   );
   adCmd.command("pmax-create").description(
-    '\u65B0\u5EFA Performance Max \u5E7F\u544A\u7CFB\u5217\uFF08\u540C\u6B65 API\uFF1B\u4EC5\u652F\u6301 JSON \u914D\u7F6E\u6587\u4EF6\uFF09\n\n  \u7528\u6CD5\uFF1A\n    1. \u590D\u5236 pmax-create-template.json\uFF0C\u5B57\u6BB5\u8BF4\u660E\u89C1 pmax-create-template.md\n    2. siluzan-tso ad geo search -a <accountId> -q "United States"\n    3. siluzan-tso ad pmax-validate --config-file ./pmax.json\n    4. siluzan-tso ad pmax-create --config-file ./pmax.json  # imagePaths \u81EA\u52A8\u4E0A\u4F20\n    5. siluzan-tso ad campaigns -a <accountId> --json-out  # \u786E\u8BA4 PERFORMANCE_MAX'
+    '\u65B0\u5EFA Performance Max \u5E7F\u544A\u7CFB\u5217\uFF08\u540C\u6B65 API\uFF1B\u4EC5\u652F\u6301 JSON \u914D\u7F6E\u6587\u4EF6\uFF09\n\n  \u7528\u6CD5\uFF1A\n    1. \u590D\u5236 pmax-create-template.json\uFF0C\u5B57\u6BB5\u8BF4\u660E\u89C1 pmax-create-template.md\n    2. siluzan-tso ad geo search -a <accountId> -q "United States"\n    3. siluzan-tso ad pmax-validate --config-file ./pmax.json\n    4. siluzan-tso ad pmax-create --config-file ./pmax.json  # imagePaths \u81EA\u52A8\u4E0A\u4F20\uFF1BvideoPath \u6216 youtubeUrlOrId \u94FE\u63A5\u89C6\u9891\n    5. siluzan-tso ad campaigns -a <accountId> --json-out  # \u786E\u8BA4 PERFORMANCE_MAX\n  \u89C6\u9891\uFF1AvideoPath\uFF08PyAPI \u4E0A\u4F20\uFF09\u6216 youtubeUrlOrId\uFF1B\u6216\u521B\u5EFA\u540E pmax-youtube-link'
   ).requiredOption(
     "--config-file <path>",
     "JSON \u914D\u7F6E\u6587\u4EF6\uFF08\u6A21\u677F\u89C1 assets/siluzan-ads/assets/pmax-create-*.json|md\uFF09"

package/dist/skill/_meta.json

@@ -1,5 +1,5 @@
 {
   "slug": "siluzan-tso",
-  "version": "1.1.22-beta.12",
-  "publishedAt": 1779959114618
+  "version": "1.1.22-beta.14",
+  "publishedAt": 1779963596845
 }

package/dist/skill/assets/pmax-create-template.md

@@ -16,6 +16,7 @@
 | 文案超长 | `pmax-validate --json-out` 读 `lengthViolations`（含完整 `text`）；**勿自动截断**，列改写方案给用户确认后再改 JSON 并重跑 validate（同 Search `campaign-validate`） |
 | 金额 | JSON 填**主币种「元」**；CLI 提交前 `budget`、`targetCpa_BidingAmount` ×100 |
 | 图片 | **只填 `imagePaths`** 指向本地 PNG/JPEG；`pmax-create` 会自动 multipart 上传并用 assetId 创建（勿把 Base64 提交进 Git） |
+| 视频 | **`videoPath`**（本地，PyAPI 上传）或 **`youtubeUrlOrId`**（已有 YouTube）二选一；`pmax-create` 成功后自动链接；或 `ad pmax-youtube-link` |
 | 改已上线 PMax | `ad pmax-get` / `pmax-edit` / `pmax-assets-update` 等（见 `references/google-ads/pmax-api.md`） |
 | 列表复核 | `ad campaigns -a <id> --json-out ./snap`，`channelTypeV2` 应为 `PERFORMANCE_MAX` |
 
@@ -61,6 +62,11 @@ siluzan-tso ad campaigns -a <accountId> --json-out ./snap
 | `biddingStrategyTypeV2` | string | | 默认 `MAXIMIZE_CONVERSIONS` |
 | `targetCpa_BidingAmount` | number | | `TARGET_CPA` 或带目标 CPA 的 `MAXIMIZE_CONVERSIONS` 时必填（**元**） |
 | `targetRoas` | number | | `TARGET_ROAS` 时必填（如 `2.5` = 250%） |
+| `videoPath` | string | | 本地视频路径（`.mp4` / `.mov` 等）；经 PyAPI 上传后自动链接（与 `youtubeUrlOrId` 二选一） |
+| `videoTitle` | string | | PyAPI 上传标题（默认文件名） |
+| `videoDescription` | string | | PyAPI 上传描述（可选） |
+| `youtubeUrlOrId` | string | | 已有 YouTube URL 或 11 位 ID；`pmax-create` 后自动链接 |
+| `youtubeAssetName` | string | | 链接 YouTube 时的资产显示名 |
 
 \* 三张图各须有一种来源（路径或 Base64）。
 

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

@@ -48,6 +48,8 @@
 
 **图片**：配置 `imagePaths`（相对 JSON 文件目录）或 `marketingImageBase64` / `squareMarketingImageBase64` / `logoImageBase64`。`pmax-validate` 会自动校验图片尺寸（最小值 / 推荐值 / 宽高比 ±2% / 文件大小 ≤5120 KB）。如需将任意图片转为合规素材，用 `ad pmax-image-convert`（`marketing` / `square` / `logo` 三种格式，sharp 处理，居中裁切）。
 
+**视频**：`videoPath`（本地文件，经 `{googleApiUrl}/pyapi` 上传并轮询 `video_id` 后自动链接）与 `youtubeUrlOrId` **二选一**；或创建后 `ad pmax-youtube-link`。
+
 **禁止**：对已创建的 PMax 系列使用 `ad campaign-edit`（旧 PUT 会 **400**）。
 
 ### 已上线 PMax 管理（CLI）

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

@@ -38,6 +38,12 @@
 2. `ad pmax-validate` → 用户确认 → `ad pmax-create`：CLI **自动上传**三张图并写入 `*ImageAssetId`（Body 不含 Base64）。
 3. 可选预上传：`ad pmax-image-upload -a <id> --image-path ./x.png`，将返回 `id` 写入 JSON。
 
+### 视频
+
+- **`videoPath`**：本地 `.mp4` 等；`pmax-create` 经 **GoogleAdsPyAPI** `POST {googleApiUrl}/pyapi/video/upload` 上传，轮询 `GET .../upload/status` 得 `video_id`，再 `POST .../asset-group/{id}/youtube` 链接（与 `youtubeUrlOrId` 二选一）。
+- **`youtubeUrlOrId`**：已有 YouTube URL 或 11 位 ID；创建成功后自动链接。
+- 或创建后：`ad pmax-youtube-link -a <id> --asset-group-id <agId> --campaign-id <cid> --youtube "<url或ID>"`。
+
 ---
 
 ## 编辑流程

package/dist/skill/scripts/install.ps1

@@ -9,7 +9,7 @@ $ErrorActionPreference = 'Stop'
 # -- Package info (injected at build time) ------------------------------------
 $PKG_NAME    = 'siluzan-tso-cli'
 # PKG_VERSION 锁定到与本脚本同批构建产物一致的版本，避免与 dist/skill 错位
-$PKG_VERSION = '1.1.22-beta.12'
+$PKG_VERSION = '1.1.22-beta.14'
 $CLI_BIN     = 'siluzan-tso'
 $SKILL_LABEL = 'Siluzan TSO'
 $INSTALL_CMD = 'npm install -g siluzan-tso-cli@beta'

package/dist/skill/scripts/install.sh

@@ -9,7 +9,7 @@ set -euo pipefail
 # -- Package info (injected at build time) ------------------------------------
 readonly PKG_NAME="siluzan-tso-cli"
 # PKG_VERSION 锁定到与本脚本同批构建产物一致的版本，避免与 dist/skill 错位
-readonly PKG_VERSION="1.1.22-beta.12"
+readonly PKG_VERSION="1.1.22-beta.14"
 readonly CLI_BIN="siluzan-tso"
 readonly SKILL_LABEL="Siluzan TSO"
 readonly INSTALL_CMD="npm install -g siluzan-tso-cli@beta"

package/package.json

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