@gitruck/cli 0.2.19 → 0.2.22

package/dist/index.js

@@ -4196,7 +4196,7 @@ var {
 } = import__.default;
 
 // src/index.ts
-import { readFileSync as readFileSync5 } from "node:fs";
+import { readFileSync as readFileSync6 } from "node:fs";
 import { join as join30 } from "node:path";
 
 // src/lib/paths.ts
@@ -4557,6 +4557,7 @@ function writeUserConfig(patch) {
 // src/lib/jianying.ts
 import { join as join4, resolve as resolve2 } from "node:path";
 import { existsSync as existsSync4 } from "node:fs";
+import { cp, mkdir, readdir } from "node:fs/promises";
 function probeJianyingDraftDir() {
   const local = process.env.LOCALAPPDATA;
   if (!local)
@@ -4575,6 +4576,31 @@ function resolveJianyingDraftDir(opt) {
     return saved;
   return probeJianyingDraftDir();
 }
+var JIANYING_DRAFT_FILES = ["draft_content.json", "draft_meta_info.json"];
+async function copyJianyingDraft(srcDir, destDir) {
+  const entries = (await readdir(srcDir, { withFileTypes: true })).sort((a, b) => a.name < b.name ? -1 : a.name > b.name ? 1 : 0);
+  const chosen = new Map;
+  for (const fixed of JIANYING_DRAFT_FILES) {
+    const cands = entries.filter((e) => e.isFile() && e.name.toLowerCase().endsWith(fixed));
+    const pick = cands.find((e) => e.name.toLowerCase() === fixed) ?? cands[0];
+    if (pick)
+      chosen.set(pick.name, fixed);
+  }
+  await mkdir(destDir, { recursive: true });
+  const landed = {};
+  const passthrough = [];
+  for (const e of entries) {
+    const fixed = chosen.get(e.name);
+    const dest = join4(destDir, fixed ?? e.name);
+    await cp(join4(srcDir, e.name), dest, { recursive: true });
+    if (fixed)
+      landed[fixed] = dest;
+    else
+      passthrough.push(e.name);
+  }
+  const missing = JIANYING_DRAFT_FILES.filter((f) => !landed[f]);
+  return { landed, missing, complete: missing.length === 0, passthrough };
+}
 
 // src/lib/open.ts
 import { spawn } from "node:child_process";
@@ -6175,7 +6201,7 @@ function registerInstall(program2) {
 
 // src/commands/oralcut.ts
 import { resolve as resolve4, join as join15, dirname as dirname3, basename as basename6, extname as extname2 } from "node:path";
-import { mkdir as mkdir4, writeFile as writeFile5, readFile as readFile4 } from "node:fs/promises";
+import { mkdir as mkdir5, writeFile as writeFile5, readFile as readFile4 } from "node:fs/promises";
 import { existsSync as existsSync13 } from "node:fs";
 
 // src/lib/config.ts
@@ -6330,7 +6356,7 @@ async function download(url, dest) {
 
 // src/lib/upload-cache.ts
 import { join as join11 } from "node:path";
-import { stat as stat3, mkdir, readFile as readFile2, writeFile as writeFile2 } from "node:fs/promises";
+import { stat as stat3, mkdir as mkdir2, readFile as readFile2, writeFile as writeFile2 } from "node:fs/promises";
 import { existsSync as existsSync10 } from "node:fs";
 
 // src/lib/chunk-upload.ts
@@ -6581,7 +6607,7 @@ async function load() {
   }
 }
 async function save(cache) {
-  await mkdir(CACHE_DIR, { recursive: true });
+  await mkdir2(CACHE_DIR, { recursive: true });
   await writeFile2(CACHE_FILE, JSON.stringify(cache, null, 2));
 }
 var defaultUploadCacheDeps = {
@@ -6608,7 +6634,7 @@ async function loadSessions() {
   }
 }
 async function saveSessions(sessions) {
-  await mkdir(CACHE_DIR, { recursive: true });
+  await mkdir2(CACHE_DIR, { recursive: true });
   await writeFile2(SESSION_FILE, JSON.stringify(sessions, null, 2));
 }
 var fileSessionStore = {
@@ -6696,7 +6722,7 @@ async function uploadAndSubmitTask(cfg, path, taskType, buildPayload, options =
 }
 
 // src/lib/media.ts
-import { mkdir as mkdir2, stat as stat4 } from "node:fs/promises";
+import { mkdir as mkdir3, stat as stat4 } from "node:fs/promises";
 import { existsSync as existsSync11 } from "node:fs";
 import { basename as basename4, extname, join as join12 } from "node:path";
 function parseFps(rate) {
@@ -6747,7 +6773,7 @@ function probeDuration(path, ffmpegPath) {
 async function artifactPath(inputAbs, ext) {
   const s = await stat4(inputAbs);
   const base = basename4(inputAbs, extname(inputAbs));
-  await mkdir2(audioCacheDir(), { recursive: true });
+  await mkdir3(audioCacheDir(), { recursive: true });
   return join12(audioCacheDir(), `${base}.${s.size}_${Math.round(s.mtimeMs)}.${ext}`);
 }
 async function extractAudio(inputAbs, ffmpegPath) {
@@ -6810,7 +6836,7 @@ function assertDurationConsistent(originalDuration, artifactAbs, ffmpegPath, tol
 
 // src/lib/materialize.ts
 import { join as join14, basename as basename5 } from "node:path";
-import { mkdir as mkdir3, cp, writeFile as writeFile4 } from "node:fs/promises";
+import { mkdir as mkdir4, writeFile as writeFile4 } from "node:fs/promises";
 
 // src/lib/render.ts
 import { writeFile as writeFile3, unlink, readFile as readFile3 } from "node:fs/promises";
@@ -7037,7 +7063,7 @@ async function materializeResult(opts) {
   if (!files.length)
     throw new Error("任务无工程文件产物（检查 project_formats / 任务是否产出）");
   const errors = { ...output.errors ?? {} };
-  await mkdir3(outDir, { recursive: true });
+  await mkdir4(outDir, { recursive: true });
   const resultPath = join14(outDir, "result.json");
   const writeResult = async (extra) => {
     const r = {
@@ -7061,7 +7087,7 @@ async function materializeResult(opts) {
   for (const f of files) {
     const base = baseFormat(f.format);
     const fmtDir = join14(outDir, base);
-    await mkdir3(fmtDir, { recursive: true });
+    await mkdir4(fmtDir, { recursive: true });
     const dest = join14(fmtDir, f.filename);
     try {
       await dl(f.download_url, dest);
@@ -7078,13 +7104,17 @@ async function materializeResult(opts) {
   }
   let jianyingDraftPath = null;
   if (byFormat.jianying && opts.draftDir) {
+    const dest = join14(opts.draftDir, basename5(outDir));
     try {
-      jianyingDraftPath = join14(opts.draftDir, basename5(outDir));
-      await mkdir3(jianyingDraftPath, { recursive: true });
-      await cp(join14(outDir, "jianying"), jianyingDraftPath, { recursive: true });
-      log.info(`剪映草稿已落到：${jianyingDraftPath}`);
+      const landing = await copyJianyingDraft(join14(outDir, "jianying"), dest);
+      if (landing.complete) {
+        jianyingDraftPath = dest;
+        log.info(`剪映草稿已落到：${dest}`);
+      } else {
+        errors["jianying:draft"] = `草稿两件套不全（缺 ${landing.missing.join("、")}），剪映列表里不会显示：${dest}`;
+        log.warn(errors["jianying:draft"]);
+      }
     } catch (e) {
-      jianyingDraftPath = null;
       errors["jianying:draft"] = e instanceof Error ? e.message : String(e);
       log.warn(`剪映草稿落盘失败：${errors["jianying:draft"]}`);
     }
@@ -7259,7 +7289,7 @@ async function runOralCut(input, opts) {
   const { taskId } = submitted;
   const up = { fileId: submitted.fileId, cached: submitted.cached };
   log.info(`task_id = ${taskId}`);
-  await mkdir4(outDir, { recursive: true });
+  await mkdir5(outDir, { recursive: true });
   await writeFile5(join15(outDir, "task.json"), JSON.stringify({ taskId, taskType: TASK_TYPE, fileId: up.fileId, source: inputAbs, formats, createdAt: new Date().toISOString() }, null, 2));
   log.step("④ 云端处理中（每 5s 轮询）…");
   const result = await pollTask(cfg, TASK_TYPE, taskId, (status, progress) => {
@@ -7285,13 +7315,141 @@ async function runOralCut(input, opts) {
 
 // src/commands/long2short.ts
 import { resolve as resolve6, join as join17, dirname as dirname5, basename as basename8, extname as extname5 } from "node:path";
-import { mkdir as mkdir6, writeFile as writeFile7, cp as cp2 } from "node:fs/promises";
-import { existsSync as existsSync15 } from "node:fs";
+import { mkdir as mkdir7, writeFile as writeFile7 } from "node:fs/promises";
+import { existsSync as existsSync16 } from "node:fs";
+
+// src/lib/clip-brief.ts
+var str = (v) => {
+  const s = typeof v === "string" ? v.trim() : "";
+  return s ? s : undefined;
+};
+var num = (v) => typeof v === "number" && Number.isFinite(v) ? v : undefined;
+var list = (v) => Array.isArray(v) ? v.map((x) => str(x)).filter((x) => !!x) : [];
+function fmtTime(ms) {
+  const total = Math.max(0, Math.round((num(ms) ?? 0) / 1000));
+  const s = total % 60;
+  const m = Math.floor(total / 60) % 60;
+  const h = Math.floor(total / 3600);
+  const mm = h ? String(m).padStart(2, "0") : String(m);
+  return `${h ? `${h}:` : ""}${mm}:${String(s).padStart(2, "0")}`;
+}
+var baseName = (p) => p.split(/[\\/]/).pop() || p;
+var cell = (s) => s.replace(/\|/g, "\\|").replace(/\s*\n\s*/g, " ");
+function jumpcutText(note) {
+  if (note === "jumpcut_off")
+    return "未启用跳剪（`--no-jump-cut`），片段按原样保留。";
+  if (note === "too_short")
+    return "片段过短，跳剪跳过（保留全部内容）。";
+  if (note === "degraded")
+    return "跳剪降级：本条未压缩，保留全部内容。";
+  return note;
+}
+function clipDurationMs(clip) {
+  return num(clip.total_duration_ms) ?? num(clip.duration_ms);
+}
+function clipSegmentCount(clip) {
+  return num(clip.segment_count) ?? (Array.isArray(clip.segments) ? clip.segments.length : undefined);
+}
+function sourceSpan(clip) {
+  const segs = Array.isArray(clip.segments) ? clip.segments : [];
+  if (segs.length) {
+    const b2 = num(segs[0]?.begin_time);
+    const e2 = num(segs[segs.length - 1]?.end_time);
+    if (b2 != null && e2 != null)
+      return [b2, e2];
+  }
+  const b = num(clip.begin_time);
+  const e = num(clip.end_time);
+  return b != null && e != null ? [b, e] : undefined;
+}
+function renderClipBrief(clip, index, files = {}) {
+  const title = str(clip.title);
+  const out = [`# clip${index}${title ? `「${title}」` : ""}`, ""];
+  const bits = [];
+  const dur = clipDurationMs(clip);
+  if (dur != null)
+    bits.push(`时长 ${fmtTime(dur)}`);
+  const segCount = clipSegmentCount(clip);
+  if (segCount != null)
+    bits.push(`${segCount} 个保留片段`);
+  const span = sourceSpan(clip);
+  if (span)
+    bits.push(`源片 ${fmtTime(span[0])}–${fmtTime(span[1])}`);
+  if (bits.length)
+    out.push(`- ${bits.join(" · ")}`, "");
+  const score = num(clip.score);
+  const reason = str(clip.score_reason);
+  if (score != null || reason) {
+    out.push("## 入选理由", "");
+    out.push([score != null ? `**评分 ${score}**` : null, reason].filter(Boolean).join(" — "), "");
+  }
+  const summary = str(clip.summary);
+  if (summary)
+    out.push("## 简介", "", summary, "");
+  const note = str(clip.jumpcut_note);
+  if (note)
+    out.push("## 跳剪", "", jumpcutText(note), "");
+  const cats = [
+    ["主题", list(clip.themes)],
+    ["标签", list(clip.tags)],
+    ["类型", list(clip.genres)],
+    ["调性", list(clip.moods)]
+  ];
+  const shown = cats.filter(([, v]) => v.length);
+  if (shown.length) {
+    out.push("## 分类与调性", "");
+    for (const [k, v] of shown)
+      out.push(`- ${k}：${v.join("、")}`);
+    out.push("");
+  }
+  const hl = Array.isArray(clip.highlight_words) ? clip.highlight_words : [];
+  const hlRows = hl.map((h) => ({ text: str(h?.text), at: num(h?.begin_time) })).filter((h) => h.text);
+  if (hlRows.length) {
+    out.push("## 高光词（源片时码）", "");
+    for (const h of hlRows)
+      out.push(`- ${h.at != null ? `${fmtTime(h.at)} ` : ""}「${h.text}」`);
+    out.push("");
+  }
+  const formats = Object.keys(files).filter((f) => files[f]?.length);
+  if (formats.length) {
+    out.push("## 本条工程文件", "");
+    for (const f of formats)
+      out.push(`- ${f}：${files[f].map(baseName).join("、")}`);
+    out.push("");
+  }
+  return `${out.join(`
+`).replace(/\n{3,}/g, `
+
+`).trimEnd()}
+`;
+}
+function renderClipsOverview(clips, ctx) {
+  const name = ctx.source.split(/[\\/]/).pop() || ctx.source;
+  const out = [`# ${name} · 长剪短总览`, ""];
+  out.push(`- 源片：\`${ctx.source}\``);
+  out.push(`- 切片：${clips.length} 条`);
+  out.push(`- 跳剪：${ctx.jumpCut ? "开" : "关"}`);
+  if (ctx.splitMaterials?.total)
+    out.push(`- 分屏素材：${ctx.splitMaterials.landed}/${ctx.splitMaterials.total} 条已落地`);
+  if (ctx.taskId)
+    out.push(`- task_id：\`${ctx.taskId}\``);
+  out.push("");
+  out.push("| # | 标题 | 时长 | 评分 | 简介 |", "| --- | --- | --- | --- | --- |");
+  for (const [i, clip] of clips.entries()) {
+    const dur = clipDurationMs(clip);
+    const score = num(clip.score);
+    out.push(`| clip${i} | ${cell(str(clip.title) ?? "—")} | ${dur != null ? fmtTime(dur) : "—"} | ${score ?? "—"} | ${cell(str(clip.summary) ?? "—")} |`);
+  }
+  out.push("", "> 逐条入选理由、跳剪说明、高光词见各 `clip{i}/clip.md`。");
+  return `${out.join(`
+`)}
+`;
+}
 
 // src/lib/tool-runner.ts
 import { resolve as resolve5, join as join16, dirname as dirname4, basename as basename7, extname as extname4 } from "node:path";
-import { mkdir as mkdir5, writeFile as writeFile6, stat as stat5 } from "node:fs/promises";
-import { createWriteStream, existsSync as existsSync14 } from "node:fs";
+import { mkdir as mkdir6, writeFile as writeFile6, stat as stat5 } from "node:fs/promises";
+import { createWriteStream, existsSync as existsSync15 } from "node:fs";
 import { Readable as Readable2 } from "node:stream";
 import { pipeline } from "node:stream/promises";
 
@@ -7375,7 +7533,8 @@ async function resolveToolPricing(priceKey, pricingContext, fetchFn = fetch) {
 }
 
 // src/lib/tool-descriptors.ts
-import { extname as extname3 } from "node:path";
+import { readFileSync as readFileSync4 } from "node:fs";
+import { extname as extname3, resolve as resolvePath } from "node:path";
 var MULTI_INPUT_KINDS = new Set(["images", "videos"]);
 var IMAGE_EXTS = [".jpg", ".jpeg", ".png", ".webp", ".bmp", ".gif", ".tif", ".tiff", ".heic", ".heif", ".avif"];
 var VIDEO_EXTS = [".mp4", ".mov", ".mkv", ".webm", ".avi", ".m4v", ".flv", ".wmv", ".mpg", ".mpeg", ".ts", ".m2ts"];
@@ -8191,7 +8350,7 @@ var audioStretch = {
   taskType: "audio_stretch",
   options: [
     { flag: "--semitones <n>", desc: "变调半音（升正降负；未传则不变调）" },
-    { flag: "--speed <n>", desc: "变速倍率（必须 > 0；未传则不变速）" }
+    { flag: "--speed <n>", desc: "变速/语速倍率（各工具范围与缺省见各自说明）" }
   ],
   buildPayload(fileId, ctx) {
     const payload = { file_id: fileId };
@@ -8549,6 +8708,66 @@ var videoSplitScreen = {
     return url ? [{ url, filename: `${ctx.baseName}-splitscreen${extFromUrl(url, ".mp4")}` }] : [];
   }
 };
+var audioTtsClone = {
+  name: "audio_tts_clone",
+  title: "声音克隆配音",
+  description: "输入一段文字，用指定音色合成配音音频（--text 短文本或 --text-file 文本文件二选一，≤2000 字）。按文本字数折算分钟计费。",
+  kind: "cloud",
+  input: { kind: "none" },
+  priceKey: "audio_tts_clone",
+  outputHint: "配音音频（wav/mp3）",
+  enabled: true,
+  taskType: "audio_tts_clone",
+  options: [
+    { flag: "--text <text>", desc: "待合成的短文本（与 --text-file 二选一）" },
+    { flag: "--text-file <file>", desc: "待合成的文本文件（UTF-8；与 --text 二选一）" },
+    { flag: "--speaker <code>", desc: "音色代号（必填；可用列表见官网文档「可用音色」，传错时报错会列出全部可用项）" },
+    { flag: "--text-lang <lang>", desc: "文本语言（未传则服务端默认 zh）" },
+    { flag: "--output-format <fmt>", desc: "输出音频格式 wav/mp3（未传则服务端默认 wav）" },
+    { flag: "--split-method <m>", desc: "长文切分法 cut0~cut5（未传则跟随该音色调好的参数）" },
+    { flag: "--batch-size <n>", desc: "分段并发批大小 1~16（未传则服务端默认）" }
+  ],
+  buildPayloadNone(ctx) {
+    const o = ctx.opts;
+    const hasText = typeof o.text === "string" && o.text.trim() !== "";
+    const hasFile = typeof o.textFile === "string" && o.textFile.trim() !== "";
+    if (hasText && hasFile)
+      throw new Error("--text 与 --text-file 只能给其一");
+    if (!hasText && !hasFile)
+      throw new Error("需要 --text <短文本> 或 --text-file <文本文件>（UTF-8）之一");
+    const text = hasText ? o.text : readFileSync4(resolvePath(o.textFile), "utf8");
+    if (!text.trim())
+      throw new Error("文本内容为空");
+    if (!(typeof o.speaker === "string" && o.speaker.trim())) {
+      throw new Error("audio_tts_clone 需要 --speaker <音色代号>（可用列表见官网文档；传错时服务端报错会列出可用项）");
+    }
+    const p = { text, speaker: o.speaker };
+    if (typeof o.textLang === "string")
+      p.text_lang = o.textLang;
+    if (typeof o.outputFormat === "string")
+      p.output_format = o.outputFormat;
+    const speed = parseNumFlag(o.speed, "--speed");
+    if (speed != null)
+      p.speed = speed;
+    if (typeof o.splitMethod === "string")
+      p.text_split_method = o.splitMethod;
+    const bs = parseNumFlag(o.batchSize, "--batch-size");
+    if (bs != null) {
+      if (!Number.isInteger(bs))
+        throw new Error(`--batch-size 需要整数，拿到「${String(o.batchSize)}」`);
+      p.batch_size = bs;
+    }
+    return p;
+  },
+  mapOutputs(out, ctx) {
+    const url = pickUrl(out, ["download_url"]);
+    if (!url)
+      return [];
+    const fallback = typeof ctx.opts.outputFormat === "string" ? `.${ctx.opts.outputFormat}` : ".wav";
+    const speaker = typeof ctx.opts.speaker === "string" && ctx.opts.speaker.trim() ? ctx.opts.speaker : "voice";
+    return [{ url, filename: `tts-${speaker}${extFromUrl(url, fallback)}` }];
+  }
+};
 var mad = {
   name: "mad",
   title: "一键剪 MAD",
@@ -8599,6 +8818,7 @@ var TOOL_REGISTRY = [
   imageClassicTemplate,
   imageVerticalStitch,
   videoSplitScreen,
+  audioTtsClone,
   mad
 ];
 function findTool(name, registry = TOOL_REGISTRY) {
@@ -8635,6 +8855,19 @@ function validateRegistry(registry = TOOL_REGISTRY) {
     } else if (d.buildPayloadMulti) {
       throw new Error(`非多文件工具不得声明 buildPayloadMulti：「${d.name}」`);
     }
+    if (d.buildPayloadNone) {
+      if (d.input.kind !== "none")
+        throw new Error(`非 none 工具不得声明 buildPayloadNone：「${d.name}」`);
+      if (d.buildPayload || d.buildPayloadMulti) {
+        throw new Error(`buildPayloadNone 与其他 payload 钩子互斥：「${d.name}」`);
+      }
+    }
+    if (d.kind === "cloud" && d.input.kind === "none") {
+      const paths = (d.preprocess ? 1 : 0) + (d.buildPayloadNone ? 1 : 0);
+      if (paths !== 1) {
+        throw new Error(`none 工具须声明 preprocess 或 buildPayloadNone 恰一：「${d.name}」`);
+      }
+    }
   }
 }
 
@@ -8685,7 +8918,7 @@ function validateToolInput(descriptor, inputAbs) {
     return;
   if (!inputAbs)
     throw new Error(`${descriptor.name} 需要输入${spec.kind === "directory" ? "目录" : "文件"}`);
-  if (!existsSync14(inputAbs))
+  if (!existsSync15(inputAbs))
     throw new Error(`输入不存在：${inputAbs}`);
   if (spec.kind === "directory")
     return;
@@ -8702,7 +8935,7 @@ function validateToolInputs(descriptor, inputAbsList) {
     throw new Error(`${descriptor.name} 需要至少一个输入文件（可传多个，顺序即拼装顺序）`);
   const exts = descriptor.input.exts ?? defaultExtsFor(descriptor.input.kind);
   for (const p of inputAbsList) {
-    if (!existsSync14(p))
+    if (!existsSync15(p))
       throw new Error(`输入不存在：${p}`);
     if (exts && exts.length) {
       const e = extname4(p).toLowerCase();
@@ -8827,7 +9060,7 @@ async function runCloudTool(descriptor, inputArg, opts, deps) {
   const isMulti = MULTI_INPUT_KINDS.has(descriptor.input.kind);
   const inputList = isMulti ? (Array.isArray(inputArg) ? inputArg : inputArg != null ? [inputArg] : []).map((p) => resolve5(p)) : undefined;
   const inputAbs = isMulti ? inputList[0] : typeof inputArg === "string" ? resolve5(inputArg) : undefined;
-  const baseName = inputAbs ? basename7(inputAbs, extname4(inputAbs)) : descriptor.name;
+  const baseName2 = inputAbs ? basename7(inputAbs, extname4(inputAbs)) : descriptor.name;
   if (isMulti) {
     validateToolInputs(descriptor, inputList);
   } else {
@@ -8839,7 +9072,7 @@ async function runCloudTool(descriptor, inputArg, opts, deps) {
   const ctx = {
     inputAbs,
     ...inputList ? { inputAbsList: inputList } : {},
-    baseName,
+    baseName: baseName2,
     ffmpegPath: opts.ffmpegPath,
     opts,
     extraParams,
@@ -8849,11 +9082,13 @@ async function runCloudTool(descriptor, inputArg, opts, deps) {
   const outDir = resolveOutDir(descriptor, inputAbs, opts.out);
   if (isMulti)
     descriptor.buildPayloadMulti(inputList.map(() => "__dry_run__"), ctx);
+  const isNoneDirect = descriptor.input.kind === "none" && !!descriptor.buildPayloadNone;
   let uploadPath = inputAbs;
   if (!isMulti && descriptor.preprocess)
     uploadPath = await descriptor.preprocess(ctx);
-  if (!uploadPath)
-    throw new Error(`${descriptor.name} 缺上传物（input=none 的 cloud 型工具需 preprocess 产上传物）`);
+  if (!uploadPath && !isNoneDirect) {
+    throw new Error(`${descriptor.name} 缺上传物（input=none 的 cloud 型工具需 preprocess 产上传物或声明 buildPayloadNone）`);
+  }
   let billingHint;
   try {
     billingHint = (await (deps.resolvePricing ?? resolveToolPricing)(descriptor.priceKey, descriptor.pricingContext)).billingHint;
@@ -8865,7 +9100,11 @@ async function runCloudTool(descriptor, inputArg, opts, deps) {
   let taskId;
   let fileId;
   let fileIds;
-  if (isMulti) {
+  if (isNoneDirect) {
+    const p = descriptor.buildPayloadNone(ctx);
+    mergeParams(p, extraParams);
+    taskId = await deps.submitTask(deps.cfg, taskType, p);
+  } else if (isMulti) {
     const buildMulti = (fids) => {
       const p = descriptor.buildPayloadMulti(fids, ctx);
       mergeParams(p, extraParams);
@@ -8890,7 +9129,7 @@ async function runCloudTool(descriptor, inputArg, opts, deps) {
     taskId = submitted.taskId;
     fileId = submitted.fileId;
   }
-  await mkdir5(outDir, { recursive: true });
+  await mkdir6(outDir, { recursive: true });
   const fingerprint2 = inputList ? await Promise.all(inputList.map((p) => safeFingerprint(p))) : inputAbs ? await safeFingerprint(inputAbs) : undefined;
   await writeFile6(join16(outDir, "task.json"), JSON.stringify({
     tool: descriptor.name,
@@ -8996,6 +9235,34 @@ function buildLong2ShortPayload(fileId, opts, geo, inputAbs, formats, draftTarge
   mergeParams(p, parseExtraParams2(opts.param ?? [], opts.paramsJson));
   return p;
 }
+async function copyClipDraftsToRoot(clipDirs, draftTarget, errors) {
+  const paths = [];
+  let complete = 0;
+  let attempted = 0;
+  for (const [i, dir] of clipDirs.entries()) {
+    const src = join17(dir, "jianying");
+    if (!existsSync16(src)) {
+      paths.push(null);
+      continue;
+    }
+    attempted++;
+    const dest = `${draftTarget}_clip${i}`;
+    try {
+      const landing = await copyJianyingDraft(src, dest);
+      if (landing.complete) {
+        complete++;
+        paths.push(dest);
+      } else {
+        paths.push(null);
+        errors[`clip${i}:jianying:draft`] = `草稿两件套不全（缺 ${landing.missing.join("、")}），剪映列表里不会显示：${dest}`;
+      }
+    } catch (e) {
+      paths.push(null);
+      errors[`clip${i}:jianying:draft`] = e instanceof Error ? e.message : String(e);
+    }
+  }
+  return { paths, complete, attempted };
+}
 function registerLong2Short(program2) {
   program2.command("long2short <input>").description("长剪短闭环：本地抽音频/720p 代理 → 只传抽出物 → 云端选段跳剪（可选分屏）→ 逐 clip 拉回 gtrk/剪映/PR 三方工程").option("--language <code>", "源语种（必填，如 zh-CN；取值以服务端支持列表为准）").option("--split-screen", "开启智能分屏：本地改传 720p 代理，云端在代理上检测多人同框并烤 720p 分屏素材（素材落毛片旁 split_screen/）").option("--split-orientation <o>", "分屏方向 auto|lr|tb（缺省服务端 auto=按内容随机）").option("--main-topic <text>", "主题引导（影响选段偏好）").option("--duration-pref <p>", "成片时长偏好（缺省服务端 auto；成片条数由内容语义决定、不可指定）").option("--max-clip-sec <n>", "单条成片时长安全上限（秒；缺省服务端默认）").option("--no-jump-cut", "关闭跳剪（默认开：片内去水词/冗余，只删不重排）").option("--output-size <s>", "输出画布 9:16|16:9|1:1 或自定义 WxH（缺省服务端 9:16）").option("-f, --formats <list>", "三方格式（逗号分隔，云端逐 clip 直产）", "gtrk,jianying,xml").option("--jianying-draft-dir <dir>", "剪映草稿根目录；传路径或 auto（默认读 gtrk init 配置 / 自动探测）").option("-o, --out <dir>", "产物根目录（缺省 = <毛片同目录>/<毛片名>-long2short）").option("--ffmpeg-path <dir>", "指定 ffmpeg/ffprobe 所在目录（缺省 ~/.gitruck/ffmpeg → 系统 PATH）").option("--param <k=v>", "透传任意云端参数（标量、可重复）", collectParam2, []).option("--params-json <json>", `透传任意云端参数（JSON 对象、支持嵌套；如 '{"split_screen":{"prefer_mode":"..."}}'）`).option("--reupload", "强制重新上传，忽略本地上传缓存").option("--no-open", "完成后不自动打开产物根目录（默认会自动打开一次）").option("--json", "机读模式：人读日志转 stderr，stdout 只输出根级结果 JSON").action(async (input, opts) => {
     await runLong2Short(input, opts);
@@ -9006,7 +9273,7 @@ async function runLong2Short(input, opts) {
     routeLogsToStderr();
   const cfg = loadConfig();
   const inputAbs = resolve6(input);
-  if (!existsSync15(inputAbs))
+  if (!existsSync16(inputAbs))
     throw new Error(`毛片不存在：${inputAbs}`);
   const projName = basename8(inputAbs, extname5(inputAbs));
   const formats = opts.formats.split(",").map((s) => s.trim()).filter(Boolean);
@@ -9043,7 +9310,7 @@ async function runLong2Short(input, opts) {
   });
   const { taskId, fileId } = { taskId: submitted.taskId, fileId: submitted.fileId };
   log.info(`task_id = ${taskId}`);
-  await mkdir6(outDir, { recursive: true });
+  await mkdir7(outDir, { recursive: true });
   await writeFile7(join17(outDir, "task.json"), JSON.stringify({ taskId, taskType: TASK_TYPE2, fileId, source: inputAbs, formats, createdAt: new Date().toISOString() }, null, 2));
   log.step("④ 云端处理中（选段/跳剪" + (opts.splitScreen ? "/分屏" : "") + "，每 5s 轮询）…");
   const output = await pollToolTask(cfg, TASK_TYPE2, taskId, {
@@ -9069,7 +9336,7 @@ async function runLong2Short(input, opts) {
       if (!/^(?:[A-Za-z]:[\\/]|[\\/])/.test(dest))
         dest = join17(dirname5(inputAbs), dest);
       try {
-        await mkdir6(dirname5(dest), { recursive: true });
+        await mkdir7(dirname5(dest), { recursive: true });
         await download(url, dest);
         splitLanded++;
       } catch (e) {
@@ -9105,20 +9372,40 @@ async function runLong2Short(input, opts) {
       log.warn(`clip${i} 落地失败（不连坐其余）：${errors[`clip${i}`]}`);
     }
   }
-  if (draftRoot) {
-    for (const [i, cr] of clipResults.entries()) {
-      const src = join17(cr.dir, "jianying");
-      if (!existsSync15(src))
-        continue;
-      const dest = `${draftTarget}_clip${i}`;
-      try {
-        await mkdir6(dest, { recursive: true });
-        await cp2(src, dest, { recursive: true });
-      } catch (e) {
-        errors[`clip${i}:jianying:draft`] = e instanceof Error ? e.message : String(e);
-      }
+  if (draftRoot && draftTarget) {
+    const landing = await copyClipDraftsToRoot(clipResults.map((c3) => c3.dir), draftTarget, errors);
+    landing.paths.forEach((p, i) => {
+      clipResults[i].jianyingDraftPath = p;
+    });
+    const { complete, attempted } = landing;
+    if (!attempted)
+      log.warn("没有任何 clip 产出剪映草稿，草稿根未落地");
+    else if (complete === attempted)
+      log.info(`剪映草稿：<草稿根>/${outName}_clip{i} —— ${complete}/${attempted} 条两件套齐全（剪映里直接可见）`);
+    else if (complete) {
+      log.info(`剪映草稿：<草稿根>/${outName}_clip{i} —— ${complete}/${attempted} 条两件套齐全（剪映里可见）`);
+      log.warn(`另有 ${attempted - complete} 条草稿两件套不全，剪映里不会显示（详见 result.json errors）`);
+    } else
+      log.warn(`${attempted} 条草稿两件套均不全，剪映里不会显示（详见 result.json errors）`);
+  }
+  for (const [i, cr] of clipResults.entries()) {
+    try {
+      await mkdir7(cr.dir, { recursive: true });
+      await writeFile7(join17(cr.dir, "clip.md"), renderClipBrief(clips[i], i, cr.files));
+    } catch (e) {
+      errors[`clip${i}:brief`] = e instanceof Error ? e.message : String(e);
     }
-    log.info(`剪映草稿：<草稿根>/${outName}_clip{i}（剪映里直接可见）`);
+  }
+  try {
+    await writeFile7(join17(outDir, "clips.md"), renderClipsOverview(clips, {
+      source: inputAbs,
+      jumpCut: opts.jumpCut !== false,
+      splitMaterials: { landed: splitLanded, total: manifest.length },
+      taskId
+    }));
+    log.info(`总览已生成：clips.md（逐条见 clip{i}/clip.md）`);
+  } catch (e) {
+    errors["clips.md"] = e instanceof Error ? e.message : String(e);
   }
   await writeFile7(join17(outDir, "report.json"), JSON.stringify(output.report ?? {}, null, 2));
   const ok = Object.keys(errors).length === 0 && clipResults.some((c3) => c3.ok);
@@ -9245,13 +9532,13 @@ function registerUpgrade(program2) {
 
 // src/commands/render.ts
 import { resolve as resolve8, dirname as dirname6, join as join19, basename as basename9, extname as extname6 } from "node:path";
-import { existsSync as existsSync16 } from "node:fs";
+import { existsSync as existsSync17 } from "node:fs";
 function registerRender(program2) {
   program2.command("render <gtrk>").description("本地渲染：gtrk 工程按 EDL 用本地 ffmpeg 渲染成片 mp4（素材取原片本地路径）").option("-o, --out <file>", "输出 mp4 路径（缺省 = <gtrk 同目录>/<gtrk 名>.mp4）").option("--crf <n>", "视频质量 CRF 14-28（越小越清晰/文件越大，默认 18）").option("--codec <c>", "视频编码（默认 h264）").option("--ffmpeg-path <dir>", "指定 ffmpeg/ffprobe 所在目录（缺省 ~/.gitruck/ffmpeg → 系统）").option("--no-open", "完成后不自动打开产物目录").option("--json", "机读模式：人读日志转 stderr，stdout 只输出结果 JSON").action(async (gtrk, opts) => {
     if (opts.json)
       routeLogsToStderr();
     const gtrkAbs = resolve8(gtrk);
-    if (!existsSync16(gtrkAbs))
+    if (!existsSync17(gtrkAbs))
       throw new Error(`gtrk 工程不存在：${gtrkAbs}`);
     const outMp4 = resolve8(opts.out ?? join19(dirname6(gtrkAbs), `${basename9(gtrkAbs, extname6(gtrkAbs))}.mp4`));
     log.step(`▶ 本地渲染：${basename9(gtrkAbs)} → ${basename9(outMp4)}`);
@@ -9278,16 +9565,16 @@ function registerRender(program2) {
 
 // src/commands/split.ts
 import { resolve as resolve9, join as join21, dirname as dirname8, basename as basename11 } from "node:path";
-import { existsSync as existsSync17 } from "node:fs";
-import { readFile as readFile5, writeFile as writeFile8, mkdir as mkdir7 } from "node:fs/promises";
+import { existsSync as existsSync18 } from "node:fs";
+import { readFile as readFile5, writeFile as writeFile8, mkdir as mkdir8 } from "node:fs/promises";
 import { createHash } from "node:crypto";
 
 // src/lib/gtrk-writeback.ts
-import { readFileSync as readFileSync4, statSync, writeFileSync as writeFileSync2, renameSync, unlinkSync } from "node:fs";
+import { readFileSync as readFileSync5, statSync, writeFileSync as writeFileSync2, renameSync, unlinkSync } from "node:fs";
 import { dirname as dirname7, join as join20, basename as basename10 } from "node:path";
 import { randomBytes as randomBytes2 } from "node:crypto";
 function readGtrk(path) {
-  const raw = readFileSync4(path, "utf8");
+  const raw = readFileSync5(path, "utf8");
   let gtrk;
   try {
     gtrk = JSON.parse(raw);
@@ -9347,7 +9634,7 @@ function registerSplit(program2) {
   });
 }
 function firstExisting(cands) {
-  return cands.find((p) => existsSync17(p));
+  return cands.find((p) => existsSync18(p));
 }
 function resolvePaths(opts) {
   const project = opts.project ? resolve9(opts.project) : undefined;
@@ -9359,7 +9646,7 @@ function resolvePaths(opts) {
   } else {
     throw new Error("需 --project <目录> 或显式 --gtrk <path>");
   }
-  if (!existsSync17(gtrkPath))
+  if (!existsSync18(gtrkPath))
     throw new Error(`找不到工程文件：${gtrkPath}`);
   let transcriptPath;
   if (opts.transcript)
@@ -9393,14 +9680,14 @@ async function runSplit(splitdoc, opts) {
   return splitdoc ? runLand(resolve9(splitdoc), baseDir, gtrkPath, transcriptPath, opts) : runView(baseDir, gtrkPath, transcriptPath, opts);
 }
 async function runView(baseDir, gtrkPath, transcriptPath, opts) {
-  if (!transcriptPath || !existsSync17(transcriptPath))
+  if (!transcriptPath || !existsSync18(transcriptPath))
     throw new Error(TRANSCRIPT_MISSING);
   log.step("▶ 导出投影视图（transcript × 当刻 .gtrk）…");
   const transcript = await loadTranscript(transcriptPath);
   const { gtrk } = readGtrk(gtrkPath);
   const view = projectTranscript(transcript, gtrk, { words: opts.words });
   const splitDir = join21(baseDir, "split");
-  await mkdir7(splitDir, { recursive: true });
+  await mkdir8(splitDir, { recursive: true });
   const viewPath = join21(splitDir, "view.json");
   await writeFile8(viewPath, JSON.stringify(view, null, 2));
   const dropped = view.utterances.filter((u) => u.dropped).length;
@@ -9419,9 +9706,9 @@ async function runView(baseDir, gtrkPath, transcriptPath, opts) {
   return result;
 }
 async function runLand(splitdocPath, baseDir, gtrkPath, transcriptPath, opts) {
-  if (!existsSync17(splitdocPath))
+  if (!existsSync18(splitdocPath))
     throw new Error(`找不到拆分稿：${splitdocPath}`);
-  if (!transcriptPath || !existsSync17(transcriptPath))
+  if (!transcriptPath || !existsSync18(transcriptPath))
     throw new Error(TRANSCRIPT_MISSING);
   log.step("▶ 校验拆分稿并落地…");
   const doc = JSON.parse(await readFile5(splitdocPath, "utf8"));
@@ -9459,7 +9746,7 @@ async function runLand(splitdocPath, baseDir, gtrkPath, transcriptPath, opts) {
   });
   writeStructMetaSplit(gtrkPath, gtrk, landing.split, mtimeMs);
   const splitDir = join21(baseDir, "split");
-  await mkdir7(splitDir, { recursive: true });
+  await mkdir8(splitDir, { recursive: true });
   const dispatchPath = join21(splitDir, "dispatch.json");
   await writeFile8(dispatchPath, JSON.stringify(landing.dispatch, null, 2));
   let mdPath = null;
@@ -9497,8 +9784,8 @@ async function runLand(splitdocPath, baseDir, gtrkPath, transcriptPath, opts) {
 
 // src/commands/matrix.ts
 import { resolve as resolve11, join as join22, dirname as dirname9, basename as basename12 } from "node:path";
-import { existsSync as existsSync19 } from "node:fs";
-import { readFile as readFile6, writeFile as writeFile9, mkdir as mkdir8, rename } from "node:fs/promises";
+import { existsSync as existsSync20 } from "node:fs";
+import { readFile as readFile6, writeFile as writeFile9, mkdir as mkdir9, rename } from "node:fs/promises";
 
 // src/lib/solid-png.ts
 import { deflateSync } from "node:zlib";
@@ -10234,7 +10521,7 @@ function layBrollTracks(opts) {
 }
 
 // src/lib/material-integrity.ts
-import { existsSync as existsSync18 } from "node:fs";
+import { existsSync as existsSync19 } from "node:fs";
 import { resolve as resolve10 } from "node:path";
 var INTEGRITY_LIST_CAP = 10;
 var r35 = (n) => Math.round(n * 1000) / 1000;
@@ -10278,8 +10565,8 @@ function collectMaterialRefs(gtrk) {
           const id = c3[key];
           if (typeof id !== "string" || id === "")
             continue;
-          const list = out.get(id) ?? [];
-          list.push({
+          const list2 = out.get(id) ?? [];
+          list2.push({
             track: group,
             track_index: trackIndex,
             clip_id: typeof c3.clip_id === "string" ? c3.clip_id : null,
@@ -10287,7 +10574,7 @@ function collectMaterialRefs(gtrk) {
             track_ed: clipTrackEd(c3),
             key
           });
-          out.set(id, list);
+          out.set(id, list2);
         }
       }
     }
@@ -10295,7 +10582,7 @@ function collectMaterialRefs(gtrk) {
   return out;
 }
 function checkMaterialIntegrity(opts) {
-  const exists = opts.exists ?? ((p) => existsSync18(p));
+  const exists = opts.exists ?? ((p) => existsSync19(p));
   const materials = Array.isArray(opts.gtrk.materials) ? opts.gtrk.materials : [];
   const refs = collectMaterialRefs(opts.gtrk);
   const counts = { relative: 0, absolute: 0, remote: 0, noPath: 0 };
@@ -10329,15 +10616,15 @@ function checkMaterialIntegrity(opts) {
     }
     if (present)
       continue;
-    const list = refs.get(id) ?? [];
+    const list2 = refs.get(id) ?? [];
     const entry = {
       id,
       path,
       kind,
       resolved,
-      referenced: list.length > 0,
-      refCount: list.length,
-      refs: list
+      referenced: list2.length > 0,
+      refCount: list2.length,
+      refs: list2
     };
     (kind === "relative" ? dangling : external).push(entry);
   }
@@ -10486,9 +10773,9 @@ function dedupeBeatQueries(queries) {
       const best = bestByClip.get(r.clip_id);
       if (best.qi === qi && best.r === r)
         return true;
-      const list = best.r.also_matched_queries ??= [];
-      if (!list.includes(q.query))
-        list.push(q.query);
+      const list2 = best.r.also_matched_queries ??= [];
+      if (!list2.includes(q.query))
+        list2.push(q.query);
       return false;
     });
   }
@@ -10645,7 +10932,7 @@ async function runPlanMode(cfg, tier, broll, overrides, columnId, opts) {
   } else {
     throw new Error('需 --project <目录> 或显式 --dispatch <path>（ad-hoc 检索用：gtrk matrix search "<query>"）');
   }
-  if (!existsSync19(dispatchPath))
+  if (!existsSync20(dispatchPath))
     throw new Error(`找不到派单清单：${dispatchPath}（先跑 gtrk split <拆分稿> 落地派单）`);
   const dispatch = JSON.parse(await readFile6(dispatchPath, "utf8"));
   const rawQueue = Array.isArray(dispatch.film_broll) ? dispatch.film_broll : [];
@@ -10711,7 +10998,7 @@ async function runPlanMode(cfg, tier, broll, overrides, columnId, opts) {
     beats
   });
   const splitDir = join22(baseDir, "split");
-  await mkdir8(splitDir, { recursive: true });
+  await mkdir9(splitDir, { recursive: true });
   const planPath = join22(splitDir, "broll-plan.json");
   await writeFile9(planPath, JSON.stringify(plan, null, 2));
   log.ok(`候选清单已生成：${planPath}（${beats.length} beat · ${okCount}/${totalQueries} query 成功 · ${resultCount} 条候选）`);
@@ -10761,7 +11048,7 @@ function parseScoreFloor(raw) {
 }
 function locateGtrk(baseDir) {
   const cands = [join22(baseDir, "gtrk", "project.gtrk"), join22(baseDir, "project.gtrk")];
-  return cands.find((p) => existsSync19(p));
+  return cands.find((p) => existsSync20(p));
 }
 async function layIntoProject(baseDir, plan, layN, scoreFloor, blackBed, forceRelay, reproj) {
   const gtrkPath = locateGtrk(baseDir);
@@ -10776,7 +11063,7 @@ async function layIntoProject(baseDir, plan, layN, scoreFloor, blackBed, forceRe
   log.step(`▶ 候选铺轨（${layN} 轨 · 平铺 ${slotCount} 槽位 · ${clipIds.size} 个 clip，preview 代理）…`);
   const gtrkDir = dirname9(gtrkPath);
   const previewDir = join22(gtrkDir, ...BROLL_PREVIEW_DIR.split("/"));
-  await mkdir8(previewDir, { recursive: true });
+  await mkdir9(previewDir, { recursive: true });
   const prevSource = new Map;
   const prevBroll = gtrk.struct_meta?.broll;
   for (const b of prevBroll?.beats ?? []) {
@@ -10799,7 +11086,7 @@ async function layIntoProject(baseDir, plan, layN, scoreFloor, blackBed, forceRe
       continue;
     const rel = `${BROLL_PREVIEW_DIR}/${clipId}.mp4`;
     const abs = join22(gtrkDir, ...rel.split("/"));
-    if (existsSync19(abs)) {
+    if (existsSync20(abs)) {
       const prev = prevSource.get(clipId);
       if (prev !== "raw") {
         downloads.set(clipId, { rel, source: prev ?? "preview" });
@@ -10837,8 +11124,8 @@ async function layIntoProject(baseDir, plan, layN, scoreFloor, blackBed, forceRe
     forceRelay
   });
   if (summary.refused) {
-    const list = summary.keptEditedTracks;
-    log.err(`拒绝铺轨：${list.length} 条候选轨已被你在客户端编辑过（track_index ${list.join("/") || "-"}）——` + "本次不剥它们、也不铺新轨，工程文件零改动。");
+    const list2 = summary.keptEditedTracks;
+    log.err(`拒绝铺轨：${list2.length} 条候选轨已被你在客户端编辑过（track_index ${list2.join("/") || "-"}）——` + "本次不剥它们、也不铺新轨，工程文件零改动。");
     for (const w of warnings)
       log.warn(w);
     log.warn("下一步二选一：① 在客户端处置那条轨（删掉 / 移走 / 改用别的轨）后重跑本命令；" + "② 确知要丢弃那条轨上的编辑 → 加 --force-relay 强制剥离重铺" + "（会删掉已确认原片的 broll-raw-* 素材登记，盘上原片文件成孤儿，不可恢复）。");
@@ -10846,7 +11133,7 @@ async function layIntoProject(baseDir, plan, layN, scoreFloor, blackBed, forceRe
     return {
       lay: {
         refused: true,
-        keptEditedTracks: list,
+        keptEditedTracks: list2,
         laidTracks: [],
         laidClips: 0,
         removedTracks: [],
@@ -10863,8 +11150,8 @@ async function layIntoProject(baseDir, plan, layN, scoreFloor, blackBed, forceRe
     const rel = solidRelPath(spec);
     const abs = join22(gtrkDir, ...rel.split("/"));
     try {
-      if (!existsSync19(abs)) {
-        await mkdir8(dirname9(abs), { recursive: true });
+      if (!existsSync20(abs)) {
+        await mkdir9(dirname9(abs), { recursive: true });
         const tmp = `${abs}.tmp-${process.pid}`;
         await writeFile9(tmp, encodeSolidPng(spec));
         await rename(tmp, abs);
@@ -10980,8 +11267,8 @@ function slugify3(name) {
 
 // src/commands/mg.ts
 import { resolve as resolve12, join as join23, dirname as dirname10, basename as basename13 } from "node:path";
-import { existsSync as existsSync20 } from "node:fs";
-import { readFile as readFile7, mkdir as mkdir9, copyFile } from "node:fs/promises";
+import { existsSync as existsSync21 } from "node:fs";
+import { readFile as readFile7, mkdir as mkdir10, copyFile } from "node:fs/promises";
 
 // src/lib/mg-lint.ts
 var CDN_OK = [/lib\.baomitu\.com/i, /cdnjs\.cloudflare\.com/i, /unpkg\.com/i];
@@ -11845,9 +12132,9 @@ function detectPrimitiveLoops(html) {
   }
   const callsByFunction = new Map;
   const pushCall = (fn, at) => {
-    const list = callsByFunction.get(fn.declStart) ?? [];
-    list.push({ at, loops: executionLoopsAt(at) });
-    callsByFunction.set(fn.declStart, list);
+    const list2 = callsByFunction.get(fn.declStart) ?? [];
+    list2.push({ at, loops: executionLoopsAt(at) });
+    callsByFunction.set(fn.declStart, list2);
   };
   const functionNames = new Set(functions.map((fn) => fn.name).filter((name) => name !== null));
   for (const call of code.matchAll(/\b([A-Za-z_$][\w$]*)\s*\(/g)) {
@@ -12048,21 +12335,27 @@ function filterDecls(styleDecls) {
     out.push(m[1].trim());
   return out;
 }
-function styleBlockOwnDecls(html) {
+function styleBlockRules(html) {
   const out = [];
   for (const sm of html.matchAll(/<style\b[^>]*>([\s\S]*?)<\/style\s*>/gi)) {
     const css = sm[1].replace(/\/\*[\s\S]*?\*\//g, " ");
     const stack = [];
+    const selStack = [];
+    let segStart = 0;
     for (let i = 0;i < css.length; i++) {
       const c3 = css[i];
       if (c3 === '"' || c3 === "'") {
         i = skipString(css, i);
         continue;
       }
-      if (c3 === "{")
+      if (c3 === "{") {
         stack.push(i);
-      else if (c3 === "}") {
+        selStack.push(css.slice(segStart, i));
+        segStart = i + 1;
+      } else if (c3 === "}") {
         const open2 = stack.pop();
+        const sel = selStack.pop() ?? "";
+        segStart = i + 1;
         if (open2 === undefined)
           continue;
         let own = css.slice(open2 + 1, i);
@@ -12070,8 +12363,9 @@ function styleBlockOwnDecls(html) {
           prev = own;
           own = own.replace(/\{[^{}]*\}/g, " ");
         }
-        out.push(own);
-      }
+        out.push({ selector: sel.trim(), own });
+      } else if (c3 === ";")
+        segStart = i + 1;
     }
   }
   return out;
@@ -12131,21 +12425,138 @@ function tweenVarObjects(js) {
   }
   return out;
 }
+var GSAP_TRANSFORM_KEY = /^(?:transform|x|y|z|xPercent|yPercent|scale|scaleX|scaleY|scaleZ|rotate|rotation|rotationX|rotationY|rotationZ|skew|skewX|skewY|translateX|translateY|translateZ)$/;
+var TWEENING_METHOD = /^(?:to|from|fromTo)$/;
+function selectorSubjectKeys(selector) {
+  const keys = [];
+  for (const alt of selector.split(",")) {
+    const subject = alt.trim().split(/[\s>+~]+/).filter(Boolean).pop();
+    if (!subject)
+      continue;
+    const core = subject.split(/[:\[]/)[0];
+    for (const m of core.matchAll(/([.#])([A-Za-z_][\w-]*)/g))
+      keys.push(`${m[1] === "#" ? "id" : "class"}:${m[2]}`);
+  }
+  return keys;
+}
+function tagIdentityKeys(tag) {
+  const keys = [];
+  const id = attr(tag, "id");
+  if (id)
+    keys.push(`id:${id.trim()}`);
+  for (const cls of (attr(tag, "class") ?? "").trim().split(/\s+/))
+    if (cls)
+      keys.push(`class:${cls}`);
+  return keys;
+}
+function tweenCalls(js) {
+  const out = [];
+  const re = /\.\s*(to|from|fromTo|set)\s*\(/g;
+  let m;
+  while (m = re.exec(js)) {
+    const open2 = m.index + m[0].length - 1;
+    const args = parenArg(js, open2);
+    re.lastIndex = open2 + 1;
+    if (args === null)
+      continue;
+    const target = readObjValue(args, 0);
+    const bodies = [];
+    for (let i = 0;i < args.length; i++) {
+      const c3 = args[i];
+      if (c3 === '"' || c3 === "'" || c3 === "`") {
+        i = skipString(args, i);
+        continue;
+      }
+      if (c3 !== "{")
+        continue;
+      const body = braceBlock(args, i);
+      bodies.push(body);
+      i += body.length + 1;
+    }
+    out.push({ method: m[1], target, bodies });
+  }
+  return out;
+}
+function selectorBindings(js) {
+  const out = new Map;
+  const re = /([A-Za-z_$][\w$]*)\s*=\s*(?:[A-Za-z_$][\w$]*\s*\.\s*)?([A-Za-z_$][\w$]*)\s*\(\s*(["'])(.*?)\3\s*\)/g;
+  for (const m of js.matchAll(re)) {
+    const [, name, fn, , raw] = m;
+    const keys = fn === "getElementById" ? [`id:${raw.trim()}`] : /^\s*[.#]/.test(raw) ? selectorSubjectKeys(raw) : [];
+    if (!keys.length)
+      continue;
+    const prev = out.get(name) ?? [];
+    out.set(name, [...new Set([...prev, ...keys])]);
+  }
+  return out;
+}
+function tweenTargetKeys(target, bindings) {
+  const t = target.trim();
+  const lit = stringLiteral(t);
+  if (lit !== null)
+    return /^\s*[.#]/.test(lit) ? selectorSubjectKeys(lit) : [];
+  if (/^[A-Za-z_$][\w$]*$/.test(t))
+    return bindings.get(t) ?? [];
+  return [];
+}
+function topLevelObjKeys(body) {
+  const keys = [];
+  let depth = 0;
+  let expectKey = true;
+  for (let i = 0;i < body.length; i++) {
+    const c3 = body[i];
+    if (c3 === '"' || c3 === "'" || c3 === "`") {
+      if (depth === 0 && expectKey) {
+        const end = skipString(body, i);
+        const name = body.slice(i + 1, end);
+        const rest = body.slice(end + 1);
+        if (/^\s*:/.test(rest)) {
+          keys.push(name);
+          expectKey = false;
+        }
+      }
+      i = skipString(body, i);
+      continue;
+    }
+    if (c3 === "(" || c3 === "[" || c3 === "{")
+      depth++;
+    else if (c3 === ")" || c3 === "]" || c3 === "}")
+      depth = Math.max(0, depth - 1);
+    else if (c3 === "," && depth === 0)
+      expectKey = true;
+    else if (depth === 0 && expectKey && /[A-Za-z_$]/.test(c3)) {
+      const m = /^([A-Za-z_$][\w$]*)\s*:/.exec(body.slice(i));
+      if (m) {
+        keys.push(m[1]);
+        expectKey = false;
+        i += m[1].length;
+      }
+    }
+  }
+  return keys;
+}
 function detectFilterCost(html) {
   const src = maskHtmlComments(html);
   const svgConvIds = svgConvolutionFilterIds(src);
   const animated = [];
   const staticFullBleed = [];
+  const staticTransformed = [];
   const indeterminate = [];
   const add = (bucket, site) => {
     const s = site.replace(/\s+/g, " ").trim().slice(0, 120);
     if (!bucket.includes(s))
       bucket.push(s);
   };
-  for (const own of styleBlockOwnDecls(src)) {
+  const staticFilterSites = new Map;
+  for (const { selector, own } of styleBlockRules(src)) {
     const hit = filterDecls(own).filter((val) => filterValueConvolves(val, svgConvIds));
-    if (hit.length && isFullBleedStyle(own))
+    if (!hit.length)
+      continue;
+    if (isFullBleedStyle(own))
       add(staticFullBleed, `<style> 规则：filter:${hit[0]}`);
+    for (const key of selectorSubjectKeys(selector))
+      if (!staticFilterSites.has(key))
+        staticFilterSites.set(key, `<style> 规则 ${selector.slice(0, 60)}：filter:${hit[0]}`);
   }
   for (const m of src.matchAll(/<[a-zA-Z][^>]*>/g)) {
     const tag = m[0];
@@ -12155,9 +12566,13 @@ function detectFilterCost(html) {
     const byAttr = refAttr !== undefined && filterValueConvolves(refAttr, svgConvIds) ? refAttr : null;
     if (!inline.length && byAttr === null)
       continue;
+    const site = inline.length ? `内联 style：filter:${inline[0]}` : `SVG 属性：filter="${byAttr}"`;
+    for (const key of tagIdentityKeys(tag))
+      if (!staticFilterSites.has(key))
+        staticFilterSites.set(key, site);
     if (!isFullBleedStyle(style))
       continue;
-    add(staticFullBleed, inline.length ? `内联 style：filter:${inline[0]}` : `SVG 属性：filter="${byAttr}"`);
+    add(staticFullBleed, site);
   }
   const js = maskJsComments(scriptBodiesOnly(src));
   for (const body of tweenVarObjects(js)) {
@@ -12172,7 +12587,22 @@ function detectFilterCost(html) {
     if (svgConvIds.size && /(?:^|[{,])\s*["']?stdDeviation["']?\s*:/.test(body))
       add(animated, "补间驱动 SVG 滤镜基元的 stdDeviation");
   }
-  return { animated, staticFullBleed, indeterminate };
+  if (staticFilterSites.size) {
+    const bindings = selectorBindings(js);
+    for (const { method, target, bodies } of tweenCalls(js)) {
+      if (!TWEENING_METHOD.test(method))
+        continue;
+      const driven = bodies.some((b) => topLevelObjKeys(b).some((k) => GSAP_TRANSFORM_KEY.test(k)));
+      if (!driven)
+        continue;
+      for (const key of tweenTargetKeys(target, bindings)) {
+        const site = staticFilterSites.get(key);
+        if (site)
+          add(staticTransformed, `${site} —— 而 \`.${method}(${target.trim().slice(0, 30)}, …)\` 驱动了它的 transform`);
+      }
+    }
+  }
+  return { animated, staticFullBleed, staticTransformed, indeterminate };
 }
 function lintParticle(html, opts = {}) {
   const v = [];
@@ -12278,6 +12708,8 @@ function lintParticle(html, opts = {}) {
     push("c-filter-animated", false, `时间线补间直接驱动了真卷积滤镜（${cost.animated.slice(0, 3).join("；")}）——` + "blur / drop-shadow / feGaussianBlur 是**真卷积**，每帧成本 ∝「被覆盖面积 × 半径 × 帧数」；" + "一旦被补间驱动，卷积结果**每帧失效**、缓存彻底失灵，这是本组三项里成本机制最重的一项。" + "改法：用 `opacity` / `transform`（`scale` / 位移）表达同一叙事动作；" + "确需滤镜就做成**静态两态切换**（滤镜值不随时间连续变），并把被滤元素的几何覆盖面积收到真正需要的那块矩形上。" + "本项是**成本提示**，不影响 ok / 退出码 / 铺轨；**未报 ≠ 这颗便宜**——真判据是真渲染出片计时");
   if (cost.staticFullBleed.length)
     push("c-filter-static-fullbleed", false, `整幅静态真卷积滤镜（${cost.staticFullBleed.slice(0, 3).join("；")}）——该声明自身即全幅` + "（`position:absolute|fixed` + `inset:0` 或等价铺满），于是每帧都要对整幅做一次卷积。" + "**首选改法：缩小被滤镜覆盖的几何面积**（把滤镜收到它真正需要的那块矩形上——面积一项同时压掉卷积与整幅逐帧合成两笔成本）；" + "次选把静态滤镜结果**预烘成图**，且 MUST 用 **RGBA PNG**（透明叠加颗粒的 alpha 是成片合成的必需通道，" + "烘成 JPEG 或任何无 alpha 格式会在成片里塌成不透明色块），但预烘只消得掉卷积、消不掉整幅逐帧合成，收益有上限、必有残差。" + "去不去滤镜属审美取值，判断权在作者：本项只给信息与改法，**恒非致命**、不拦铺轨；未报 ≠ 便宜，真判据是真渲染出片计时");
+  if (cost.staticTransformed.length)
+    push("c-filter-static-transformed", false, `静态真卷积滤镜的元素，其 transform 被补间驱动（${cost.staticTransformed.slice(0, 3).join("；")}）——` + "滤镜值本身不变，但被滤子树**每帧换一个几何**，卷积结果每帧失效、必须重算，" + "与 `c-filter-animated` 是**同一类缓存失效**，只是驱动源从滤镜值换成了 transform。" + "r69 真渲实测：同颗粒对照下这一档 **+42.7%**，比「补间驱动 blur」的 +36.2% **还贵**——它是本组里最容易被忽略的一档。" + "改法（按优先级）：① 把滤镜移到**不参与位移/缩放**的那一层（滤镜层与运动层拆开，运动交给外层容器）；" + "② 缩小被滤元素的几何覆盖面积；③ 把静态滤镜结果**预烘成 RGBA PNG** 再让它随 transform 走（预烘图平移是零卷积）。" + "⚠️ 射程只收 `transform`：`opacity` 被补间驱动**不在本项射程**（opacity 侧尚无对照实测，不凭推测扩）。" + "本项恒非致命、不拦铺轨；未报 ≠ 便宜，真判据是真渲染出片计时");
   if (cost.indeterminate.length)
     push("c-filter-indeterminate", false, `该处 filter 值无法静态判定是否含真卷积（${cost.indeterminate.slice(0, 3).join("；")}）——` + "补间值不是字符串字面量（变量 / 模板串 / 函数返回），本 lint 不做表达式求值与常量折叠，" + "故对该处**未作判定**：既不是「判过且通过」，也不是命中。请人工确认它是否会驱动 blur / drop-shadow；" + "若是，按 `c-filter-animated` 的改法处理。本项恒非致命、不拦铺轨");
   return { ok: !v.some((x) => x.fatal), violations: v, opaque, compositionId: cid };
@@ -12506,18 +12938,18 @@ function resolveDispatch(opts) {
   throw new Error("需 --project <目录> 或显式 --dispatch <path>");
 }
 function locateGtrk2(baseDir) {
-  return [join23(baseDir, "gtrk", "project.gtrk"), join23(baseDir, "project.gtrk")].find((p) => existsSync20(p));
+  return [join23(baseDir, "gtrk", "project.gtrk"), join23(baseDir, "project.gtrk")].find((p) => existsSync21(p));
 }
 function locateSrcHtml(baseDir, compositionId) {
   for (const d of MG_SRC_DIRS) {
     const p = join23(baseDir, d, `${compositionId}.html`);
-    if (existsSync20(p))
+    if (existsSync21(p))
       return p;
   }
   return;
 }
 async function readMgQueue(dispatchPath) {
-  if (!existsSync20(dispatchPath))
+  if (!existsSync21(dispatchPath))
     throw new Error(`找不到派单清单：${dispatchPath}（先跑 gtrk split 落地派单）`);
   const dispatch = JSON.parse(await readFile7(dispatchPath, "utf8"));
   const queue = dispatch.mg ?? dispatch.rrv_mg;
@@ -12700,7 +13132,7 @@ async function runLay(opts) {
   if (opts.replaceAll && orphans.length > 0) {
     log.warn(`--replace-all：已显式授权重置整轨，轨上其余 ${orphans.length} 颗已铺颗粒将被剥离（不走增量保留）。`);
   }
-  await mkdir9(join23(gtrkDir, ...MG_ASSET_DIR.split("/")), { recursive: true });
+  await mkdir10(join23(gtrkDir, ...MG_ASSET_DIR.split("/")), { recursive: true });
   for (const it of items) {
     await copyFile(srcByComp.get(it.composition_id), join23(gtrkDir, ...it.html_rel.split("/")));
   }
@@ -12751,7 +13183,7 @@ async function runLint(args, opts) {
   let dispatchIds;
   let slotDuration;
   let compositionId;
-  if (opts.dispatch && existsSync20(resolve12(opts.dispatch))) {
+  if (opts.dispatch && existsSync21(resolve12(opts.dispatch))) {
     const queue = await readMgQueue(resolve12(opts.dispatch));
     dispatchIds = queue.map((q) => q.composition_id);
     const byName = queue.find((q) => q.composition_id === nameId);
@@ -12817,12 +13249,12 @@ function done(opts, result) {
 }
 
 // src/lib/mad/mad.ts
-import { mkdir as mkdir12, writeFile as writeFile11 } from "node:fs/promises";
-import { existsSync as existsSync23, statSync as statSync3 } from "node:fs";
+import { mkdir as mkdir13, writeFile as writeFile11 } from "node:fs/promises";
+import { existsSync as existsSync24, statSync as statSync3 } from "node:fs";
 import { resolve as resolve13, join as join27 } from "node:path";
 
 // src/lib/convert/types.ts
-function num(v, d = 0) {
+function num2(v, d = 0) {
   return typeof v === "number" && isFinite(v) ? v : d;
 }
 function parseCubicBezier(e) {
@@ -12871,19 +13303,19 @@ function mergeChannelTracks(ta, tb, defA, defB) {
     if (!track || track.length === 0)
       return dflt;
     if (t <= track[0].t)
-      return num(track[0].v, dflt);
+      return num2(track[0].v, dflt);
     for (let i = 1;i < track.length; i++) {
       if (t <= track[i].t) {
         const p = track[i - 1];
         const q = track[i];
         const span = q.t - p.t;
         if (span <= 0)
-          return num(q.v, dflt);
+          return num2(q.v, dflt);
         const k = (t - p.t) / span;
-        return num(p.v, dflt) + (num(q.v, dflt) - num(p.v, dflt)) * k;
+        return num2(p.v, dflt) + (num2(q.v, dflt) - num2(p.v, dflt)) * k;
       }
     }
-    return num(track[track.length - 1].v, dflt);
+    return num2(track[track.length - 1].v, dflt);
   };
   const times = new Set;
   for (const k of ta ?? [])
@@ -12904,17 +13336,17 @@ function sampleTrack(track, t, def) {
   if (!track || track.length === 0)
     return def;
   if (t <= track[0].t)
-    return num(track[0].v, def);
+    return num2(track[0].v, def);
   for (let i = 1;i < track.length; i++) {
     const a = track[i - 1];
     const b = track[i];
     if (t <= b.t) {
       const span = Math.max(b.t - a.t, 0.000001);
       const k = (t - a.t) / span;
-      return num(a.v, def) + (num(b.v, def) - num(a.v, def)) * k;
+      return num2(a.v, def) + (num2(b.v, def) - num2(a.v, def)) * k;
     }
   }
-  return num(track[track.length - 1].v, def);
+  return num2(track[track.length - 1].v, def);
 }
 function phasePair(i) {
   return [Math.sin(i * 2.399), Math.cos(i * 3.11)];
@@ -12942,13 +13374,13 @@ function baseRot(anim, t) {
   return sampleTrack(anim.rot, t, 0);
 }
 function opWindow(fx, ly) {
-  const t0 = num(fx.t0, num(ly.in, 0));
-  const t1 = num(fx.t1, num(ly.out, t0 + 1));
+  const t0 = num2(fx.t0, num2(ly.in, 0));
+  const t1 = num2(fx.t1, num2(ly.out, t0 + 1));
   return [t0, t1];
 }
 function bakeLayerOps(ly) {
   const anim = ly.anim ?? {};
-  const pos = [num(ly.pos?.[0], 0), num(ly.pos?.[1], 0)];
+  const pos = [num2(ly.pos?.[0], 0), num2(ly.pos?.[1], 0)];
   const tracks = [];
   const warnings = [];
   for (const fx of ly.fx ?? []) {
@@ -12964,8 +13396,8 @@ function bakeLayerOps(ly) {
       const times = [];
       const values = [];
       for (const k of tr) {
-        const t = num(k.t, 0);
-        const v = num(k.v, 1);
+        const t = num2(k.t, 0);
+        const v = num2(k.v, 1);
         const [bx, by] = baseScale(anim, t);
         times.push(round(t, 3));
         values.push([round(bx * v * 100, 3), round(by * v * 100, 3)]);
@@ -12978,9 +13410,9 @@ function bakeLayerOps(ly) {
     if (op === "flicker") {
       if (t1 - t0 < 0.05)
         continue;
-      let freq = num(fx.freq, 8);
+      let freq = num2(fx.freq, 8);
       freq = clamp(freq >= 0.5 ? freq : freq * 30, 0.5, 20);
-      const mag = clamp(num(fx.mag, 0.6), 0.05, 1);
+      const mag = clamp(num2(fx.mag, 0.6), 0.05, 1);
       const hi = 1 + mag * 0.8;
       const lo = Math.max(0.3, 1 - mag * 0.6);
       const n = Math.min(dn(Math.max(2, Math.floor((t1 - t0) * freq * 2))), 160);
@@ -12999,8 +13431,8 @@ function bakeLayerOps(ly) {
     if (t1 - t0 < 0.05)
       continue;
     if (op === "shake") {
-      const amp0 = num(fx.mag ?? fx.amp, 18);
-      const freq = clamp(num(fx.freq, 20), 1, 40);
+      const amp0 = num2(fx.mag ?? fx.amp, 18);
+      const freq = clamp(num2(fx.freq, 20), 1, 40);
       const n = Math.min(dn(Math.max(2, Math.floor((t1 - t0) * freq))), 160);
       const tr = fx.tracks?.mag;
       const seqX = [];
@@ -13030,9 +13462,9 @@ function bakeLayerOps(ly) {
     }
     if (op === "oscillate") {
       if (fx.rot === true) {
-        const a1 = num(fx.a1, -3);
-        const a2 = num(fx.a2, 3);
-        const freq = clamp(num(fx.freq, 2), 0.2, 20);
+        const a1 = num2(fx.a1, -3);
+        const a2 = num2(fx.a2, 3);
+        const freq = clamp(num2(fx.freq, 2), 0.2, 20);
         const n = Math.min(dn(Math.max(4, Math.floor((t1 - t0) * freq * 4))), 120);
         const times = [round(t0, 3)];
         const values = [[round(baseRot(anim, t0), 3)]];
@@ -13049,9 +13481,9 @@ function bakeLayerOps(ly) {
         }
         tracks.push({ prop: "rotation", times, values, window: [t0, t1] });
       } else {
-        const mag0 = num(fx.mag, 40);
-        const ang = num(fx.angle, 90) * Math.PI / 180;
-        const freq = clamp(num(fx.freq, 4), 0.2, 30);
+        const mag0 = num2(fx.mag, 40);
+        const ang = num2(fx.angle, 90) * Math.PI / 180;
+        const freq = clamp(num2(fx.freq, 4), 0.2, 30);
         const n = Math.min(dn(Math.max(4, Math.floor((t1 - t0) * freq * 4))), 160);
         const tr = fx.tracks?.mag;
         const times = [round(t0, 3)];
@@ -13083,13 +13515,13 @@ function bakeLayerOps(ly) {
       let lo;
       let hi;
       if (fx.amp != null) {
-        lo = 1 - num(fx.amp, 0);
-        hi = 1 + num(fx.amp, 0);
+        lo = 1 - num2(fx.amp, 0);
+        hi = 1 + num2(fx.amp, 0);
       } else {
-        lo = num(fx.min, 1);
-        hi = num(fx.max, 1.06);
+        lo = num2(fx.min, 1);
+        hi = num2(fx.max, 1.06);
       }
-      const freq = clamp(num(fx.freq, 2), 0.2, 20);
+      const freq = clamp(num2(fx.freq, 2), 0.2, 20);
       const n = Math.min(dn(Math.max(4, Math.floor((t1 - t0) * freq * 4))), 160);
       const tr = fx.tracks?.max;
       const times = [round(t0, 3)];
@@ -13251,7 +13683,7 @@ function positionBaseKeys(anim, pos) {
 function scaleBaseKeys(anim, coverExpr) {
   const sc = (v) => coverExpr ? `${r37(v)}*${coverExpr}` : `${r37(v)}`;
   if (anim.scale?.length) {
-    return anim.scale.map((k) => ({ t: k.t, value: `[${sc(num(k.v, 1) * 100)}, ${sc(num(k.v, 1) * 100)}]`, e: k.e }));
+    return anim.scale.map((k) => ({ t: k.t, value: `[${sc(num2(k.v, 1) * 100)}, ${sc(num2(k.v, 1) * 100)}]`, e: k.e }));
   }
   if (anim.sx?.length || anim.sy?.length) {
     const merged = mergeChannelTracks(anim.sx, anim.sy, 1, 1);
@@ -13266,9 +13698,9 @@ function emitBakedOps(ctx, ly, layerVar, tf, coverExpr) {
   if (tracks.length === 0)
     return;
   const anim = ly.anim ?? {};
-  const pos = [num(ly.pos?.[0], 0), num(ly.pos?.[1], 0)];
-  const inn = num(ly.in, 0);
-  const out = Math.max(inn + 0.01, num(ly.out, inn + 1));
+  const pos = [num2(ly.pos?.[0], 0), num2(ly.pos?.[1], 0)];
+  const inn = num2(ly.in, 0);
+  const out = Math.max(inn + 0.01, num2(ly.out, inn + 1));
   const sc = (v) => coverExpr ? `${r37(v)}*${coverExpr}` : `${r37(v)}`;
   const brights = tracks.filter((t) => t.prop === "brightness");
   if (brights.length) {
@@ -13315,7 +13747,7 @@ function emitBakedOps(ctx, ly, layerVar, tf, coverExpr) {
   }
   const rotBaked = tracks.filter((t) => t.prop === "rotation");
   if (rotBaked.length) {
-    const baseKeys = (anim.rot ?? []).map((k) => ({ t: k.t, value: `${r37(num(k.v, 0))}`, e: k.e }));
+    const baseKeys = (anim.rot ?? []).map((k) => ({ t: k.t, value: `${r37(num2(k.v, 0))}`, e: k.e }));
     const bakedKeys = [];
     const windows = [];
     for (const bt of rotBaked) {
@@ -13333,10 +13765,10 @@ function emitLayer(ctx, ir, ly, parentNullVar) {
   const c3 = ir.canvas;
   const id = ++ctx.layerSeq;
   const v = `ly${id}`;
-  const inn = num(ly.in, 0);
-  const out = Math.max(inn + 0.01, num(ly.out, c3.duration));
-  const px = num(ly.pos?.[0], c3.w / 2);
-  const py = num(ly.pos?.[1], c3.h / 2);
+  const inn = num2(ly.in, 0);
+  const out = Math.max(inn + 0.01, num2(ly.out, c3.duration));
+  const px = num2(ly.pos?.[0], c3.w / 2);
+  const py = num2(ly.pos?.[1], c3.h / 2);
   const name = esc(`${ly.id || "L" + id} [${ly.type}]`);
   L.push(``);
   L.push(`  // ---- 层 ${name} in=${r37(inn)} out=${r37(out)} ----`);
@@ -13358,9 +13790,9 @@ function emitLayer(ctx, ir, ly, parentNullVar) {
   const footageHit = ly.type === "image" || ly.type === "video" ? ctx.footage[ly.id] : undefined;
   const fgVar = footageHit ? ctx.footageVars.get(footageHit.path) : undefined;
   if (footageHit && fgVar) {
-    const slotW = Math.max(2, Math.round(num(ly.w, c3.w)));
-    const slotH = Math.max(2, Math.round(num(ly.h, c3.h)));
-    const srcOffset = num(footageHit.srcOffset, 0);
+    const slotW = Math.max(2, Math.round(num2(ly.w, c3.w)));
+    const slotH = Math.max(2, Math.round(num2(ly.h, c3.h)));
+    const srcOffset = num2(footageHit.srcOffset, 0);
     const cvv = `cv${id}`;
     coverExpr = cvv;
     L.push(`  // 素材注入(${esc(String(ly.type))}): footage srcOffset=${r37(srcOffset)}`);
@@ -13391,14 +13823,14 @@ function emitLayer(ctx, ir, ly, parentNullVar) {
     L.push(`  } catch (e) {}`);
   } else if (ly.type === "shape") {
     const col = colorArr(ly.fill, [0.2, 0.33, 0.67]);
-    const w = Math.max(2, Math.round(num(ly.w, 400)));
-    const h = Math.max(2, Math.round(num(ly.h, 400)));
+    const w = Math.max(2, Math.round(num2(ly.w, 400)));
+    const h = Math.max(2, Math.round(num2(ly.h, 400)));
     if (ly.shape === "ellipse")
       L.push(`  // TODO: 原层为椭圆形状,固态占位,可手动换 shape layer`);
     L.push(`  var ${v} = ${cv}.layers.addSolid([${col.join(",")}], "${name}", ${w}, ${h}, 1, ${r37(c3.duration)});`);
   } else {
-    const w = Math.max(2, Math.round(num(ly.w, c3.w)));
-    const h = Math.max(2, Math.round(num(ly.h, c3.h)));
+    const w = Math.max(2, Math.round(num2(ly.w, c3.w)));
+    const h = Math.max(2, Math.round(num2(ly.h, c3.h)));
     L.push(`  // 占位素材(${esc(String(ly.type))}${ly.asset ? ` asset=${esc(String(ly.asset))}` : ""}): 请替换为真实素材`);
     L.push(`  var ${v} = ${cv}.layers.addSolid([0.35,0.35,0.4], "${name} [占位]", ${w}, ${h}, 1, ${r37(c3.duration)});`);
   }
@@ -13428,10 +13860,10 @@ function emitLayer(ctx, ir, ly, parentNullVar) {
     }
   }
   if (anim.rot?.length && !bakedProps.has("rotation")) {
-    emitKeys(ctx, `${tf}.property("ADBE Rotate Z")`, anim.rot.map((k) => ({ t: k.t, value: `${r37(num(k.v, 0))}`, e: k.e })));
+    emitKeys(ctx, `${tf}.property("ADBE Rotate Z")`, anim.rot.map((k) => ({ t: k.t, value: `${r37(num2(k.v, 0))}`, e: k.e })));
   }
   if (anim.opacity?.length) {
-    emitKeys(ctx, `${tf}.property("ADBE Opacity")`, anim.opacity.map((k) => ({ t: k.t, value: `${r37(Math.min(1, Math.max(0, num(k.v, 1))) * 100)}`, e: k.e })));
+    emitKeys(ctx, `${tf}.property("ADBE Opacity")`, anim.opacity.map((k) => ({ t: k.t, value: `${r37(Math.min(1, Math.max(0, num2(k.v, 1))) * 100)}`, e: k.e })));
   }
   if (anim.ls?.length) {
     L.push(`  // TODO: letterspacing 轨未自动映射（AE 需 Animator>Tracking），共 ${anim.ls.length} 帧`);
@@ -13445,8 +13877,8 @@ function emitLayer(ctx, ir, ly, parentNullVar) {
 }
 function emitGroupAnim(ctx, v, ly) {
   const anim = ly.anim ?? {};
-  const px = num(ly.pos?.[0], 0);
-  const py = num(ly.pos?.[1], 0);
+  const px = num2(ly.pos?.[0], 0);
+  const py = num2(ly.pos?.[1], 0);
   if (anim.x?.length || anim.y?.length) {
     const merged = mergeChannelTracks(anim.x, anim.y, px, py);
     emitKeys(ctx, `${v}.property("ADBE Transform Group").property("ADBE Position")`, merged.map((k) => ({ t: k.t, value: `[${r37(k.a - px)}, ${r37(k.b - py)}]`, e: k.e })));
@@ -13530,10 +13962,10 @@ function madJsx(opts) {
   const subVars = [];
   windows.forEach((win, wi) => {
     const c3 = win.ir.canvas;
-    const sw = Math.max(4, Math.round(num(c3.w, 1920)));
-    const sh = Math.max(4, Math.round(num(c3.h, 1080)));
-    const sfps = Math.min(99, Math.max(1, num(c3.fps, 30)));
-    const sdur = Math.max(0.1, num(c3.duration, 3));
+    const sw = Math.max(4, Math.round(num2(c3.w, 1920)));
+    const sh = Math.max(4, Math.round(num2(c3.h, 1080)));
+    const sfps = Math.min(99, Math.max(1, num2(c3.fps, 30)));
+    const sdur = Math.max(0.1, num2(c3.duration, 3));
     const subName = esc(`${win.uid}-${win.seq}`);
     const subVar = `sub${wi}`;
     L.push(``);
@@ -13789,8 +14221,8 @@ function beatQuantized(natLens, analysis) {
 
 // src/lib/mad/data.ts
 import { createHash as createHash2 } from "node:crypto";
-import { mkdir as mkdir10, readFile as readFile8, rename as rename2, rm, writeFile as writeFile10, readdir } from "node:fs/promises";
-import { existsSync as existsSync21 } from "node:fs";
+import { mkdir as mkdir11, readFile as readFile8, rename as rename2, rm, writeFile as writeFile10, readdir as readdir2 } from "node:fs/promises";
+import { existsSync as existsSync22 } from "node:fs";
 import { join as join25 } from "node:path";
 function madCacheDir() {
   return homeFile("mad-cache");
@@ -13820,7 +14252,7 @@ async function atomicWrite(dest, data) {
   await rename2(tmp, dest);
 }
 async function verifyFile(path, sha256) {
-  if (!existsSync21(path))
+  if (!existsSync22(path))
     return false;
   try {
     const buf = await readFile8(path);
@@ -13844,7 +14276,7 @@ function validateManifest(obj) {
 }
 async function cleanupOldVersions(cacheRoot, keepVersion, warn) {
   try {
-    const entries = await readdir(cacheRoot);
+    const entries = await readdir2(cacheRoot);
     for (const e of entries) {
       const m = /^v(\d+)$/.exec(e);
       if (m && Number(m[1]) !== keepVersion) {
@@ -13872,7 +14304,7 @@ async function ensureMadData(opts, deps) {
     warn(`manifest 拉取失败（${e instanceof Error ? e.message : String(e)}），回退本地缓存`);
   }
   if (!manifest) {
-    if (!existsSync21(snapshotPath)) {
+    if (!existsSync22(snapshotPath)) {
       throw new Error("首次使用需联网下载技法数据。请连网后重跑 `gtrk tool mad`（数据会缓存到本地，之后可离线出片）。");
     }
     try {
@@ -13894,12 +14326,12 @@ async function ensureMadData(opts, deps) {
   const needDownload = !!opts.refresh || !cacheValid;
   if (needDownload) {
     if (!online) {
-      if (existsSync21(poolPath)) {
+      if (existsSync22(poolPath)) {
         throw new Error("本地技法数据缓存损坏且当前离线。请连网重跑，或加 --refresh 强制重新下载。");
       }
       throw new Error("首次使用需联网下载技法数据。请连网后重跑 `gtrk tool mad`（数据会缓存到本地，之后可离线出片）。");
     }
-    await mkdir10(verDir, { recursive: true });
+    await mkdir11(verDir, { recursive: true });
     warn(`下载技法池数据 mad_pool（版本 v${version}，约 ${Math.round(poolMeta.size / 1024)} KB）…`);
     const res = await deps.fetchFn(poolMeta.url);
     if (!res.ok)
@@ -13912,7 +14344,7 @@ async function ensureMadData(opts, deps) {
     warn(`技法池数据就绪（v${version}）`);
   }
   if (online) {
-    await mkdir10(cacheRoot, { recursive: true });
+    await mkdir11(cacheRoot, { recursive: true });
     await atomicWrite(snapshotPath, new Uint8Array(Buffer.from(JSON.stringify(manifest), "utf8")));
     await cleanupOldVersions(cacheRoot, version, warn);
   }
@@ -13929,8 +14361,8 @@ async function ensureMadData(opts, deps) {
 
 // src/lib/mad/pool.ts
 import { gunzipSync } from "node:zlib";
-import { mkdir as mkdir11, readFile as readFile9 } from "node:fs/promises";
-import { existsSync as existsSync22 } from "node:fs";
+import { mkdir as mkdir12, readFile as readFile9 } from "node:fs/promises";
+import { existsSync as existsSync23 } from "node:fs";
 import { join as join26 } from "node:path";
 function shardPath(verDir, shard) {
   return join26(verDir, "ir", `${shard}.json.gz`);
@@ -13950,7 +14382,7 @@ function makeIrLoader(assetsBase, verDir, online, deps) {
     if (cached)
       return cached;
     const path = shardPath(verDir, shard);
-    if (existsSync22(path)) {
+    if (existsSync23(path)) {
       try {
         const s2 = decodeShard(await readFile9(path));
         memo.set(shard, s2);
@@ -13968,7 +14400,7 @@ function makeIrLoader(assetsBase, verDir, online, deps) {
       throw new Error(`IR 分片下载失败 HTTP ${res.status}：${url}`);
     const buf = new Uint8Array(await res.arrayBuffer());
     const s = decodeShard(buf);
-    await mkdir11(join26(verDir, "ir"), { recursive: true });
+    await mkdir12(join26(verDir, "ir"), { recursive: true });
     await atomicWrite(path, buf);
     memo.set(shard, s);
     return s;
@@ -13982,7 +14414,7 @@ function makeIrLoader(assetsBase, verDir, online, deps) {
       return ir;
     },
     shardCached(shard) {
-      return memo.has(shard) || existsSync22(shardPath(verDir, shard));
+      return memo.has(shard) || existsSync23(shardPath(verDir, shard));
     }
   };
 }
@@ -14066,7 +14498,7 @@ async function runMad(inputArg, opts, deps = {}) {
   if (!inputArg)
     throw new Error("用法：gtrk tool mad <素材文件夹> [--bgm 歌.mp3]");
   const dirAbs = resolve13(inputArg);
-  if (!existsSync23(dirAbs) || !statSync3(dirAbs).isDirectory()) {
+  if (!existsSync24(dirAbs) || !statSync3(dirAbs).isDirectory()) {
     throw new Error(`素材文件夹不存在或不是目录：${dirAbs}`);
   }
   const { videos, orientation, skipped } = scanFolder(dirAbs, {
@@ -14181,7 +14613,7 @@ async function runMad(inputArg, opts, deps = {}) {
   const bgm = level <= 2 && bgmForTrack ? { path: bgmForTrack, markers } : undefined;
   const { jsx } = madJsx({ master, windows, header, bgm });
   const outDir = opts.out ? resolve13(opts.out) : join27(process.cwd(), `mad-${timestamp4(now)}`);
-  await mkdir12(outDir, { recursive: true });
+  await mkdir13(outDir, { recursive: true });
   const jsxPath = join27(outDir, "mad.jsx");
   await writeFile11(jsxPath, jsx);
   const result = {
@@ -14327,8 +14759,8 @@ async function runMadInTool(inputArg, opts) {
 }
 
 // src/commands/transcript.ts
-import { existsSync as existsSync24 } from "node:fs";
-import { mkdir as mkdir13, rename as rename3, rm as rm2, stat as stat6, writeFile as writeFile12 } from "node:fs/promises";
+import { existsSync as existsSync25 } from "node:fs";
+import { mkdir as mkdir14, rename as rename3, rm as rm2, stat as stat6, writeFile as writeFile12 } from "node:fs/promises";
 import { basename as basename14, dirname as dirname11, extname as extname8, join as join28, resolve as resolve14 } from "node:path";
 
 // src/lib/transcript.ts
@@ -14466,7 +14898,7 @@ async function validateTranscriptInput(input) {
     throw new Error("视频转文字稿仅支持本地视频文件，不支持 URL、平台视频地址或远端下载");
   }
   const inputAbs = resolve14(input);
-  if (!existsSync24(inputAbs))
+  if (!existsSync25(inputAbs))
     throw new Error(`本地视频不存在：${inputAbs}`);
   const info = await stat6(inputAbs);
   if (!info.isFile())
@@ -14485,7 +14917,7 @@ function resolveTranscriptOutput(inputAbs, out) {
   return output;
 }
 async function writeMarkdownAtomic(path, markdown) {
-  await mkdir13(dirname11(path), { recursive: true });
+  await mkdir14(dirname11(path), { recursive: true });
   const temp = `${path}.${process.pid}.${Math.random().toString(16).slice(2)}.tmp`;
   try {
     await writeFile12(temp, markdown, "utf8");
@@ -14563,8 +14995,8 @@ function registerTranscript(program2) {
 
 // src/commands/music-visualizer.ts
 import { resolve as resolve15, join as join29, dirname as dirname12, basename as basename15, extname as extname9 } from "node:path";
-import { mkdir as mkdir14, writeFile as writeFile13 } from "node:fs/promises";
-import { existsSync as existsSync25 } from "node:fs";
+import { mkdir as mkdir15, writeFile as writeFile13 } from "node:fs/promises";
+import { existsSync as existsSync26 } from "node:fs";
 var TASK_TYPE5 = "music_visualizer";
 var PRICE_KEY2 = "music_visualizer";
 var HEX_RE = /^#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/;
@@ -14612,7 +15044,7 @@ function timestamp5() {
   return `${p(d.getFullYear() % 100)}${p(d.getMonth() + 1)}${p(d.getDate())}-${p(d.getHours())}${p(d.getMinutes())}${p(d.getSeconds())}`;
 }
 function assertExt(pathAbs, exts, label) {
-  if (!existsSync25(pathAbs))
+  if (!existsSync26(pathAbs))
     throw new Error(`${label}不存在：${pathAbs}`);
   const e = extname9(pathAbs).toLowerCase();
   if (exts.length && !exts.includes(e)) {
@@ -14728,7 +15160,7 @@ async function runMusicVisualizer(audio, opts) {
   });
   const { taskId } = submitted;
   log.info(`task_id = ${taskId}`);
-  await mkdir14(outDir, { recursive: true });
+  await mkdir15(outDir, { recursive: true });
   await writeFile13(join29(outDir, "task.json"), JSON.stringify({ taskId, taskType: TASK_TYPE5, fileId: submitted.fileId, source: audioAbs, template, createdAt: new Date().toISOString() }, null, 2));
   log.step("③ 云端处理中（每 5s 轮询）…");
   const result = await pollTask(cfg, TASK_TYPE5, taskId, (status, progress) => {
@@ -14780,7 +15212,7 @@ try {
   process.loadEnvFile?.();
 } catch {}
 migrateLegacyHome();
-var { version } = JSON.parse(readFileSync5(join30(packageRoot(), "package.json"), "utf8"));
+var { version } = JSON.parse(readFileSync6(join30(packageRoot(), "package.json"), "utf8"));
 var program2 = new Command;
 program2.name("gtrk").description("同合云成片流水线 CLI —— agent 驱动云端任务、产物拉回本地、三方工程文件（客户端/剪映/PR）互通").version(version);
 registerInstall(program2);