@gitruck/cli 0.2.2 → 0.2.3

package/dist/index.js

@@ -4197,12 +4197,13 @@ var {
 
 // src/index.ts
 import { readFileSync as readFileSync3 } from "node:fs";
-import { join as join9 } from "node:path";
+import { join as join15 } from "node:path";
 
 // src/lib/paths.ts
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
-import { existsSync } from "node:fs";
+import { homedir } from "node:os";
+import { cpSync, existsSync, mkdirSync } from "node:fs";
 function packageRoot() {
   let dir = dirname(fileURLToPath(import.meta.url));
   for (let i = 0;i < 8; i++) {
@@ -4215,11 +4216,36 @@ function packageRoot() {
   }
   return dir;
 }
+var LEGACY_HOME = join(homedir(), ".gtrk-cli");
+var GITRUCK_HOME = join(homedir(), ".gitruck");
+function gitruckHome() {
+  return GITRUCK_HOME;
+}
+function ffmpegDir() {
+  return join(GITRUCK_HOME, "ffmpeg");
+}
+function audioCacheDir() {
+  return join(GITRUCK_HOME, "audio-cache");
+}
+var _migrated = false;
+function migrateLegacyHome() {
+  if (_migrated)
+    return;
+  _migrated = true;
+  try {
+    if (!existsSync(LEGACY_HOME))
+      return;
+    if (existsSync(join(GITRUCK_HOME, "config.json")))
+      return;
+    mkdirSync(GITRUCK_HOME, { recursive: true });
+    cpSync(LEGACY_HOME, GITRUCK_HOME, { recursive: true, force: false, errorOnExist: false });
+  } catch {}
+}
 
 // src/commands/skills.ts
-import { homedir } from "node:os";
+import { homedir as homedir2 } from "node:os";
 import { join as join2 } from "node:path";
-import { existsSync as existsSync2, mkdirSync, copyFileSync } from "node:fs";
+import { existsSync as existsSync2, mkdirSync as mkdirSync2, copyFileSync } from "node:fs";
 
 // src/lib/log.ts
 var c = {
@@ -4255,9 +4281,9 @@ function installSkill(opts = {}) {
     log.warn(`找不到打包的 skill 源：${SRC}（跳过 skill 安装，不影响命令行）`);
     return false;
   }
-  const dest = join2(opts.dir ?? join2(homedir(), ".claude", "skills"), SKILL_NAME);
+  const dest = join2(opts.dir ?? join2(homedir2(), ".claude", "skills"), SKILL_NAME);
   try {
-    mkdirSync(dest, { recursive: true });
+    mkdirSync2(dest, { recursive: true });
     copyFileSync(SRC, join2(dest, "SKILL.md"));
     log.ok(`已安装 /${SKILL_NAME} → ${join2(dest, "SKILL.md")}`);
     log.info("在 Claude Code 里打 /gtrk-oralcut，或直接说「帮我剪个口播」即可触发（可能需重载会话）。");
@@ -4275,15 +4301,14 @@ function registerSkills(program2) {
 }
 
 // src/commands/init.ts
-import { join as join6, resolve as resolve2 } from "node:path";
-import { existsSync as existsSync6 } from "node:fs";
+import { join as join7, resolve as resolve2 } from "node:path";
+import { existsSync as existsSync7 } from "node:fs";
 
 // src/lib/user-config.ts
-import { homedir as homedir2 } from "node:os";
 import { join as join3 } from "node:path";
-import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync, writeFileSync } from "node:fs";
+import { existsSync as existsSync3, mkdirSync as mkdirSync3, readFileSync, writeFileSync } from "node:fs";
 var DEFAULT_API_BASE = "https://api.ai-mcn.tv:10000";
-var DIR = join3(homedir2(), ".gtrk-cli");
+var DIR = gitruckHome();
 var FILE = join3(DIR, "config.json");
 function configPath() {
   return FILE;
@@ -4298,7 +4323,7 @@ function readUserConfig() {
   }
 }
 function writeUserConfig(patch) {
-  mkdirSync2(DIR, { recursive: true });
+  mkdirSync3(DIR, { recursive: true });
   const merged = { ...readUserConfig(), ...patch };
   writeFileSync(FILE, JSON.stringify(merged, null, 2));
 }
@@ -4436,15 +4461,122 @@ async function promptConfirm(message, defaultYes = true) {
 }
 
 // src/commands/doctor.ts
+import { existsSync as existsSync6 } from "node:fs";
+
+// src/lib/ffmpeg.ts
+import { spawn as spawn2, spawnSync as spawnSync2 } from "node:child_process";
 import { existsSync as existsSync5 } from "node:fs";
+import { join as join5 } from "node:path";
+var isWin = process.platform === "win32";
+var bin = (base) => isWin ? `${base}.exe` : base;
+var FFMPEG_INSTALL_HINT = `未找到 ffmpeg/ffprobe。请把二者放到 ${ffmpegDir()}（agent 可代办：先查本地确实缺失才拉，` + `面向国内用户优先国内加速站点——GitHub 代理 pass-through 拉 BtbN/gyan.dev 官方静态构建，或同合云自建镜像，` + `并做 sha256 校验），或用 --ffmpeg-path <目录> 指定已装位置。`;
+var _cache = new Map;
+function onSystemPath(cmd) {
+  try {
+    return spawnSync2(cmd, ["-version"], { stdio: "ignore" }).status === 0;
+  } catch {
+    return false;
+  }
+}
+function resolveFfmpeg(ffmpegPath) {
+  const key = ffmpegPath ?? "";
+  if (_cache.has(key))
+    return _cache.get(key) ?? null;
+  const dirs = [];
+  if (ffmpegPath)
+    dirs.push([ffmpegPath, ffmpegPath]);
+  dirs.push([ffmpegDir(), "~/.gitruck/ffmpeg"]);
+  let found = null;
+  for (const [dir, label] of dirs) {
+    const ff = join5(dir, bin("ffmpeg"));
+    const fp = join5(dir, bin("ffprobe"));
+    if (existsSync5(ff) && existsSync5(fp)) {
+      found = { ffmpeg: ff, ffprobe: fp, source: label };
+      break;
+    }
+  }
+  if (!found && onSystemPath("ffmpeg") && onSystemPath("ffprobe")) {
+    found = { ffmpeg: "ffmpeg", ffprobe: "ffprobe", source: "system" };
+  }
+  _cache.set(key, found);
+  return found;
+}
+function requireFfmpeg(ffmpegPath) {
+  const r = resolveFfmpeg(ffmpegPath);
+  if (!r)
+    throw new Error(FFMPEG_INSTALL_HINT);
+  return r;
+}
+function ffprobeJson(ffprobePath, args) {
+  const r = spawnSync2(ffprobePath, args, { encoding: "utf8", maxBuffer: 32 * 1024 * 1024 });
+  if (r.status !== 0) {
+    throw new Error(`ffprobe 失败（code=${r.status}）：${(r.stderr || "").slice(-300)}`);
+  }
+  return JSON.parse(r.stdout || "{}");
+}
+function runFfmpeg(ffmpegPath, args, onLine) {
+  return new Promise((resolve2, reject) => {
+    const p = spawn2(ffmpegPath, args, { env: process.env });
+    let tail = "";
+    p.stderr.on("data", (buf) => {
+      const s = buf.toString("utf8");
+      tail = (tail + s).slice(-4000);
+      if (onLine) {
+        for (const ln of s.split(/\r?\n/))
+          if (ln)
+            onLine(ln);
+      }
+    });
+    p.on("error", (e) => reject(e));
+    p.on("close", (code) => {
+      if (code === 0)
+        resolve2();
+      else
+        reject(new Error(`ffmpeg 退出码 ${code}：${tail.slice(-600)}`));
+    });
+  });
+}
+function probeCapabilities(res) {
+  const ver = spawnSync2(res.ffmpeg, ["-version"], { encoding: "utf8" });
+  const version = (ver.stdout || "").split(/\r?\n/)[0]?.trim() || "unknown";
+  const enc = spawnSync2(res.ffmpeg, ["-hide_banner", "-encoders"], {
+    encoding: "utf8",
+    maxBuffer: 16 * 1024 * 1024
+  });
+  const fil = spawnSync2(res.ffmpeg, ["-hide_banner", "-filters"], {
+    encoding: "utf8",
+    maxBuffer: 16 * 1024 * 1024
+  });
+  const encoders = new Set;
+  for (const ln of (enc.stdout || "").split(/\r?\n/)) {
+    const m = ln.trim().match(/^\S+\s+(\S+)/);
+    if (m)
+      encoders.add(m[1]);
+  }
+  const filters = new Set;
+  for (const ln of (fil.stdout || "").split(/\r?\n/)) {
+    const m = ln.trim().match(/^\S+\s+(\S+)/);
+    if (m)
+      filters.add(m[1]);
+  }
+  return {
+    version,
+    encoders,
+    filters,
+    hasLibx264: encoders.has("libx264"),
+    hasAac: encoders.has("aac"),
+    hasAfade: filters.has("afade"),
+    hasAresample: filters.has("aresample")
+  };
+}
 
 // src/lib/version.ts
 import { readFileSync as readFileSync2 } from "node:fs";
-import { join as join5 } from "node:path";
+import { join as join6 } from "node:path";
 var REGISTRY = "https://registry.npmjs.org/@gitruck%2Fcli";
 function currentVersion() {
   try {
-    const { version } = JSON.parse(readFileSync2(join5(packageRoot(), "package.json"), "utf8"));
+    const { version } = JSON.parse(readFileSync2(join6(packageRoot(), "package.json"), "utf8"));
     return version;
   } catch {
     return "0.0.0";
@@ -4526,7 +4658,7 @@ async function runDoctor() {
   }
   rows.push({ name: "云端连通 + 鉴权", status: apiStatus, detail: apiDetail });
   const draftDir = resolveJianyingDraftDir(undefined);
-  const draftOk = !!draftDir && existsSync5(draftDir);
+  const draftOk = !!draftDir && existsSync6(draftDir);
   rows.push({
     name: "剪映草稿目录",
     status: draftOk ? "ok" : "warn",
@@ -4534,9 +4666,30 @@ async function runDoctor() {
   });
   rows.push({
     name: "配置文件",
-    status: existsSync5(configPath()) ? "ok" : "warn",
-    detail: existsSync5(configPath()) ? configPath() : `未生成 —— 跑 gtrk init（${configPath()}）`
+    status: existsSync6(configPath()) ? "ok" : "warn",
+    detail: existsSync6(configPath()) ? configPath() : `未生成 —— 跑 gtrk init（${configPath()}）`
   });
+  const ff = resolveFfmpeg();
+  if (ff) {
+    let hasX264 = false;
+    let ver = "";
+    try {
+      const cap = probeCapabilities(ff);
+      hasX264 = cap.hasLibx264;
+      ver = cap.version.replace(/^ffmpeg version\s*/i, "v");
+    } catch {}
+    rows.push({
+      name: "本地渲染 (ffmpeg)",
+      status: hasX264 ? "ok" : "warn",
+      detail: hasX264 ? `就绪（来源 ${ff.source}${ver ? `，${ver.split(/\s/)[0]}` : ""}）` : `找到 ffmpeg（${ff.source}）但缺 libx264 —— 本地渲染需换含 libx264 的构建`
+    });
+  } else {
+    rows.push({
+      name: "本地渲染 (ffmpeg)",
+      status: "warn",
+      detail: "未找到 —— 只出工程文件可忽略；要本地渲染成片，让 agent 装 ffmpeg/ffprobe 到 ~/.gitruck/ffmpeg 或 --ffmpeg-path"
+    });
+  }
   const cur = currentVersion();
   const latest = await latestP;
   rows.splice(1, 0, {
@@ -4561,7 +4714,7 @@ gtrk 体检：
 }
 
 // src/commands/init.ts
-var GUIDE_IMAGE = join6(packageRoot(), "assets", "jianying-draft-path.png");
+var GUIDE_IMAGE = join7(packageRoot(), "assets", "jianying-draft-path.png");
 function registerInit(program2) {
   program2.command("init").description("一次性配置：API Key + 剪映草稿目录（之后所有命令免重复配置）").option("--api-key <key>", "非交互：直接指定 API Key").option("--api-base <url>", "非交互：指定 API 根地址（缺省用默认生产地址）").option("--jianying-draft-dir <dir>", "非交互：剪映草稿目录（传 auto 则自动探测）").option("--reconfigure", "重走配置向导（默认：已配过则跳过、保留现有配置）").option("-y, --yes", "非交互：用传入值 + 自动探测，不弹任何提示").action(runInit);
 }
@@ -4600,7 +4753,7 @@ async function runInit(opts) {
     defaultValue: existing.apiBase ?? DEFAULT_API_BASE
   })).trim();
   let jianyingDraftDir;
-  if (existing.jianyingDraftDir && existsSync6(existing.jianyingDraftDir)) {
+  if (existing.jianyingDraftDir && existsSync7(existing.jianyingDraftDir)) {
     if (await promptConfirm(`剪映草稿目录现为 ${existing.jianyingDraftDir}，保留吗？`, true)) {
       jianyingDraftDir = existing.jianyingDraftDir;
     }
@@ -4616,7 +4769,7 @@ async function runInit(opts) {
     openFile(GUIDE_IMAGE);
     const manual = (await promptText("剪映草稿根目录（…\\com.lveditor.draft），留空跳过：")).trim();
     if (manual) {
-      if (existsSync6(manual))
+      if (existsSync7(manual))
         jianyingDraftDir = resolve2(manual);
       else
         log.warn(`目录不存在，已跳过：${manual}`);
@@ -4682,9 +4835,9 @@ function registerInstall(program2) {
 }
 
 // src/commands/oralcut.ts
-import { resolve as resolve3, join as join8, dirname as dirname2, basename as basename3, extname } from "node:path";
-import { mkdir as mkdir2, cp, readFile as readFile2 } from "node:fs/promises";
-import { existsSync as existsSync8 } from "node:fs";
+import { resolve as resolve3, join as join12, dirname as dirname2, basename as basename5, extname as extname2 } from "node:path";
+import { mkdir as mkdir4, writeFile as writeFile5, readFile as readFile3 } from "node:fs/promises";
+import { existsSync as existsSync11 } from "node:fs";
 
 // src/lib/config.ts
 function loadConfig() {
@@ -4763,6 +4916,21 @@ async function submitTask(cfg, taskType, payload) {
     return String(r.data.task_id);
   throw new Error(`提交失败 (code=${r.code ?? "?"})：${r.msg ?? "未知错误"}`);
 }
+async function getTaskResult(cfg, taskType, taskId) {
+  const res = await fetch(`${cfg.base}/task/${taskType}/${taskId}`, {
+    headers: { Authorization: cfg.apiKey }
+  });
+  const r = await parseJson(res);
+  if (r.code != null && r.code !== 200) {
+    throw new CloudError(r.code, `任务查询失败 (code=${r.code})：${r.msg ?? ""}`);
+  }
+  const data = r.data ?? {};
+  return {
+    status: String(data.status ?? ""),
+    progress: typeof data.progress === "number" ? data.progress : undefined,
+    output: data.output_result ?? {}
+  };
+}
 async function pollTask(cfg, taskType, taskId, onTick) {
   const start = Date.now();
   const TIMEOUT_MS = 30 * 60 * 1000;
@@ -4771,29 +4939,22 @@ async function pollTask(cfg, taskType, taskId, onTick) {
     if (Date.now() - start > TIMEOUT_MS) {
       throw new Error("任务超时（超过 30 分钟）。可稍后在云端查任务或重试。");
     }
-    await new Promise((r2) => setTimeout(r2, INTERVAL_MS));
-    let r;
+    await new Promise((r) => setTimeout(r, INTERVAL_MS));
+    let got;
     try {
-      const res = await fetch(`${cfg.base}/task/${taskType}/${taskId}`, {
-        headers: { Authorization: cfg.apiKey }
-      });
-      r = await parseJson(res);
-    } catch {
+      got = await getTaskResult(cfg, taskType, taskId);
+    } catch (e) {
+      if (e instanceof CloudError)
+        throw e;
       continue;
     }
-    if (r.code != null && r.code !== 200) {
-      throw new Error(`任务错误 (code=${r.code})：${r.msg ?? ""}`);
+    if (got.status === "completed")
+      return got.output;
+    if (got.status === "failed" || got.status === "cancelled") {
+      const out = got.output;
+      throw new Error(out?.error ?? (got.status === "failed" ? "任务失败" : "任务已取消"));
     }
-    const data = r.data ?? {};
-    const status = String(data.status ?? "");
-    if (status === "completed") {
-      return data.output_result ?? {};
-    }
-    if (status === "failed" || status === "cancelled") {
-      const out = data.output_result;
-      throw new Error(out?.error ?? (status === "failed" ? "任务失败" : "任务已取消"));
-    }
-    onTick?.(status || "处理中", typeof data.progress === "number" ? data.progress : undefined);
+    onTick?.(got.status || "处理中", got.progress);
   }
 }
 async function download(url, dest) {
@@ -4805,10 +4966,9 @@ async function download(url, dest) {
 }
 
 // src/lib/upload-cache.ts
-import { homedir as homedir3 } from "node:os";
-import { join as join7 } from "node:path";
+import { join as join8 } from "node:path";
 import { stat as stat3, mkdir, readFile, writeFile as writeFile2 } from "node:fs/promises";
-import { existsSync as existsSync7 } from "node:fs";
+import { existsSync as existsSync8 } from "node:fs";
 
 // src/lib/chunk-upload.ts
 var import_hash_wasm = __toESM(require_index_umd(), 1);
@@ -5039,15 +5199,15 @@ async function putPart(cfg, uploadId, idx, view) {
 }
 
 // src/lib/upload-cache.ts
-var CACHE_DIR = join7(homedir3(), ".gtrk-cli");
-var CACHE_FILE = join7(CACHE_DIR, "upload-cache.json");
-var SESSION_FILE = join7(CACHE_DIR, "upload-sessions.json");
+var CACHE_DIR = gitruckHome();
+var CACHE_FILE = join8(CACHE_DIR, "upload-cache.json");
+var SESSION_FILE = join8(CACHE_DIR, "upload-sessions.json");
 async function fingerprint(path) {
   const s = await stat3(path);
   return `${s.size}:${Math.round(s.mtimeMs)}`;
 }
 async function load() {
-  if (!existsSync7(CACHE_FILE))
+  if (!existsSync8(CACHE_FILE))
     return {};
   try {
     return JSON.parse(await readFile(CACHE_FILE, "utf8"));
@@ -5068,7 +5228,7 @@ async function invalidateUpload(path) {
   }
 }
 async function loadSessions() {
-  if (!existsSync7(SESSION_FILE))
+  if (!existsSync8(SESSION_FILE))
     return {};
   try {
     return JSON.parse(await readFile(SESSION_FILE, "utf8"));
@@ -5121,13 +5281,303 @@ async function uploadCached(cfg, path, opts) {
   return { fileId, cached: false };
 }
 
-// src/commands/oralcut.ts
-var TASK_TYPE = "video_oral_cut";
-function timestamp() {
-  const d = new Date;
-  const p = (n) => String(n).padStart(2, "0");
-  return `${p(d.getFullYear() % 100)}${p(d.getMonth() + 1)}${p(d.getDate())}-${p(d.getHours())}${p(d.getMinutes())}${p(d.getSeconds())}`;
+// src/lib/media.ts
+import { mkdir as mkdir2, stat as stat4 } from "node:fs/promises";
+import { existsSync as existsSync9 } from "node:fs";
+import { basename as basename3, extname, join as join9 } from "node:path";
+function parseFps(rate) {
+  if (typeof rate !== "string")
+    return 0;
+  const [n, d] = rate.split("/").map(Number);
+  if (!n || !d)
+    return Number(rate) || 0;
+  return n / d;
+}
+function probeGeometry(inputAbs, ffmpegPath) {
+  const { ffprobe } = requireFfmpeg(ffmpegPath);
+  const info = ffprobeJson(ffprobe, [
+    "-v",
+    "error",
+    "-select_streams",
+    "v:0",
+    "-show_entries",
+    "stream=width,height,r_frame_rate",
+    "-show_entries",
+    "format=duration",
+    "-of",
+    "json",
+    inputAbs
+  ]);
+  const s = info.streams && info.streams[0] || {};
+  const duration = Number(info.format?.duration) || 0;
+  return {
+    width: Number(s.width) || 0,
+    height: Number(s.height) || 0,
+    fps: parseFps(s.r_frame_rate),
+    duration
+  };
+}
+function probeDuration(path, ffmpegPath) {
+  const { ffprobe } = requireFfmpeg(ffmpegPath);
+  const info = ffprobeJson(ffprobe, [
+    "-v",
+    "error",
+    "-show_entries",
+    "format=duration",
+    "-of",
+    "json",
+    path
+  ]);
+  return Number(info.format?.duration) || 0;
+}
+async function artifactPath(inputAbs, ext) {
+  const s = await stat4(inputAbs);
+  const base = basename3(inputAbs, extname(inputAbs));
+  await mkdir2(audioCacheDir(), { recursive: true });
+  return join9(audioCacheDir(), `${base}.${s.size}_${Math.round(s.mtimeMs)}.${ext}`);
+}
+async function extractAudio(inputAbs, ffmpegPath) {
+  const { ffmpeg } = requireFfmpeg(ffmpegPath);
+  const out = await artifactPath(inputAbs, "mp3");
+  if (existsSync9(out))
+    return out;
+  await runFfmpeg(ffmpeg, [
+    "-y",
+    "-v",
+    "error",
+    "-i",
+    inputAbs,
+    "-vn",
+    "-ac",
+    "1",
+    "-ar",
+    "16000",
+    "-c:a",
+    "libmp3lame",
+    "-b:a",
+    "64k",
+    out
+  ]);
+  return out;
+}
+async function compress720p(inputAbs, ffmpegPath) {
+  const { ffmpeg } = requireFfmpeg(ffmpegPath);
+  const out = await artifactPath(inputAbs, "720p.mp4");
+  if (existsSync9(out))
+    return out;
+  await runFfmpeg(ffmpeg, [
+    "-y",
+    "-v",
+    "error",
+    "-i",
+    inputAbs,
+    "-vf",
+    "scale=-2:720",
+    "-c:v",
+    "libx264",
+    "-preset",
+    "veryfast",
+    "-crf",
+    "28",
+    "-c:a",
+    "aac",
+    "-movflags",
+    "+faststart",
+    out
+  ]);
+  return out;
+}
+function assertDurationConsistent(originalDuration, artifactAbs, ffmpegPath, tolSec = 1) {
+  const got = probeDuration(artifactAbs, ffmpegPath);
+  if (originalDuration > 0 && Math.abs(got - originalDuration) > tolSec) {
+    throw new Error(`抽出物时长（${got.toFixed(2)}s）与原片（${originalDuration.toFixed(2)}s）不一致（容差 ${tolSec}s），` + `疑似抽取异常，已中止上传`);
+  }
+}
+
+// src/lib/materialize.ts
+import { join as join11, basename as basename4 } from "node:path";
+import { mkdir as mkdir3, cp, writeFile as writeFile4 } from "node:fs/promises";
+
+// src/lib/render.ts
+import { writeFile as writeFile3, unlink, readFile as readFile2 } from "node:fs/promises";
+import { existsSync as existsSync10 } from "node:fs";
+import { tmpdir } from "node:os";
+import { join as join10 } from "node:path";
+var AUDIO_SAMPLE_RATE = 48000;
+var AUDIO_LAYOUT = "stereo";
+var DEFAULT_CRF = 18;
+var DEFAULT_AUDIO_CROSSFADE_MS = 8;
+var MAX_CLIPS = 500;
+var g = (n) => String(Number(n.toPrecision(6)));
+var f6 = (n) => n.toFixed(6);
+var f3 = (n) => n.toFixed(3);
+var isGap = (clip) => clip.material === null || clip.material === undefined;
+function sortedTracks(tracks) {
+  return tracks.map((t, i) => ({ key: t.track_index != null ? t.track_index : i, t })).sort((a, b) => a.key - b.key).map((x) => x.t);
+}
+function normalizeTrack(trackTimeline) {
+  const items = [...trackTimeline].sort((a, b) => Number(a.track_st) - Number(b.track_st));
+  const elements = [];
+  let cursor = 0;
+  for (const clip of items) {
+    const trackSt = Number(clip.track_st);
+    const duration = Number(clip.duration);
+    if (duration <= 0)
+      throw new Error(`clip duration 非法: ${JSON.stringify(clip)}`);
+    if (trackSt < cursor - 0.000001) {
+      throw new Error(`track_timeline 时间重叠: track_st=${trackSt} < cursor=${cursor.toFixed(6)}`);
+    }
+    if (trackSt > cursor + 0.000001)
+      elements.push({ kind: "gap", duration: trackSt - cursor });
+    if (!isGap(clip)) {
+      elements.push({
+        kind: "clip",
+        material: clip.material,
+        clip_st: Number(clip.clip_st),
+        duration
+      });
+    } else {
+      elements.push({ kind: "gap", duration });
+    }
+    cursor = trackSt + duration;
+  }
+  return [elements, cursor];
+}
+function buildFilterGraph(gtrk, materialPaths, params = {}) {
+  const fadeMs = Math.trunc(params.audio_crossfade_ms ?? DEFAULT_AUDIO_CROSSFADE_MS);
+  const fade = Math.max(fadeMs, 0) / 1000;
+  const sortedV = sortedTracks(gtrk.video_track || []);
+  if (sortedV.length === 0)
+    throw new Error("gtrk v1 缺少 video_track");
+  const mainVideoTrack = sortedV[0];
+  const audioTracks = sortedTracks(gtrk.audio_track || []);
+  const totalClips = [mainVideoTrack, ...audioTracks].reduce((n, t) => n + (t.track_timeline?.length || 0), 0);
+  if (totalClips > MAX_CLIPS)
+    throw new Error(`clip 总数 ${totalClips} 超过上限 ${MAX_CLIPS}`);
+  const width = Math.trunc(gtrk.video_size[0]);
+  const height = Math.trunc(gtrk.video_size[1]);
+  const rate = Number(gtrk.video_rate);
+  const inputs = [];
+  const inputIdx = {};
+  const inputOf = (materialId) => {
+    const path = materialPaths[String(materialId)];
+    if (path === undefined)
+      throw new Error(`gtrk 引用素材 ${materialId} 缺本地路径`);
+    if (!(path in inputIdx)) {
+      inputIdx[path] = inputs.length;
+      inputs.push(path);
+    }
+    return inputIdx[path];
+  };
+  const chains = [];
+  let labelN = 0;
+  const label = () => `s${++labelN}`;
+  const [vElements, vEnd] = normalizeTrack(mainVideoTrack.track_timeline);
+  const normTracks = [];
+  const aLens = [];
+  for (const t of audioTracks) {
+    const [els, end] = normalizeTrack(t.track_timeline);
+    normTracks.push(els);
+    aLens.push(end);
+  }
+  const total = aLens.length ? Math.max(vEnd, ...aLens) : vEnd;
+  if (total <= 0)
+    throw new Error("时间线总时长为 0");
+  if (total > vEnd + 0.000001)
+    vElements.push({ kind: "gap", duration: total - vEnd });
+  const vLabels = [];
+  for (const el of vElements) {
+    const lab = label();
+    if (el.kind === "clip") {
+      const idx = inputOf(el.material);
+      const st = el.clip_st;
+      const ed = el.clip_st + el.duration;
+      chains.push(`[${idx}:v]trim=start=${f6(st)}:end=${f6(ed)},setpts=PTS-STARTPTS,` + `fps=${g(rate)},scale=${width}:${height}:force_original_aspect_ratio=decrease,` + `pad=${width}:${height}:(ow-iw)/2:(oh-ih)/2:black,setsar=1,format=yuv420p[${lab}]`);
+    } else {
+      chains.push(`color=black:s=${width}x${height}:r=${g(rate)}:d=${f6(el.duration)},format=yuv420p[${lab}]`);
+    }
+    vLabels.push(lab);
+  }
+  chains.push(vLabels.map((x) => `[${x}]`).join("") + `concat=n=${vLabels.length}:v=1:a=0[vout]`);
+  const trackLabels = [];
+  for (let ti = 0;ti < normTracks.length; ti++) {
+    const els = normTracks[ti];
+    const end = aLens[ti];
+    if (total > end + 0.000001)
+      els.push({ kind: "gap", duration: total - end });
+    const segLabels = [];
+    for (const el of els) {
+      const lab2 = label();
+      if (el.kind === "clip") {
+        const idx = inputOf(el.material);
+        const st = el.clip_st;
+        const ed = el.clip_st + el.duration;
+        const steps = [
+          `[${idx}:a]atrim=start=${f6(st)}:end=${f6(ed)}`,
+          "asetpts=PTS-STARTPTS",
+          `aresample=${AUDIO_SAMPLE_RATE}`,
+          `aformat=sample_fmts=fltp:channel_layouts=${AUDIO_LAYOUT}`
+        ];
+        if (fade > 0) {
+          steps.push(`afade=t=in:d=${f3(fade)}`);
+          steps.push(`afade=t=out:st=${f6(Math.max(el.duration - fade, 0))}:d=${f3(fade)}`);
+        }
+        chains.push(steps.join(",") + `[${lab2}]`);
+      } else {
+        chains.push(`anullsrc=r=${AUDIO_SAMPLE_RATE}:cl=${AUDIO_LAYOUT},atrim=end=${f6(el.duration)}[${lab2}]`);
+      }
+      segLabels.push(lab2);
+    }
+    const lab = label();
+    chains.push(segLabels.map((x) => `[${x}]`).join("") + `concat=n=${segLabels.length}:v=0:a=1[${lab}]`);
+    trackLabels.push(lab);
+  }
+  if (trackLabels.length === 0) {
+    chains.push(`anullsrc=r=${AUDIO_SAMPLE_RATE}:cl=${AUDIO_LAYOUT},atrim=end=${f6(total)}[aout]`);
+  } else if (trackLabels.length === 1) {
+    chains.push(`[${trackLabels[0]}]anull[aout]`);
+  } else {
+    chains.push(trackLabels.map((x) => `[${x}]`).join("") + `amix=inputs=${trackLabels.length}:duration=longest:normalize=0[aout]`);
+  }
+  return { inputs, graph: chains.join(";"), total };
+}
+function materialPathsFromGtrk(gtrk) {
+  const map = {};
+  for (const m of gtrk.materials || []) {
+    if (!m.path)
+      throw new Error(`gtrk 素材 ${m.id} 缺 path（source_path），无法本地渲染`);
+    if (!existsSync10(m.path))
+      throw new Error(`gtrk 素材文件不存在：${m.path}`);
+    map[String(m.id)] = m.path;
+  }
+  return map;
+}
+async function renderGtrk(gtrk, outputPath, opts = {}) {
+  const codec = opts.codec ?? "h264";
+  if (codec !== "h264")
+    throw new Error(`v1 仅支持 h264，实际 ${codec}`);
+  const crf = opts.crf ?? DEFAULT_CRF;
+  const { ffmpeg } = requireFfmpeg(opts.ffmpegPath);
+  const materialPaths = materialPathsFromGtrk(gtrk);
+  const { inputs, graph, total } = buildFilterGraph(gtrk, materialPaths, { crf });
+  const filterFile = join10(tmpdir(), `gtrk-filter-${process.pid}-${inputs.length}.txt`);
+  await writeFile3(filterFile, graph, "utf8");
+  try {
+    const args = ["-y"];
+    for (const p of inputs)
+      args.push("-i", p);
+    args.push("-filter_complex_script", filterFile, "-map", "[vout]", "-map", "[aout]", "-c:v", "libx264", "-preset", "medium", "-crf", String(crf), "-c:a", "aac", "-b:a", "192k", "-movflags", "+faststart", outputPath);
+    await runFfmpeg(ffmpeg, args, opts.onLine);
+    return { outputPath, duration: total };
+  } finally {
+    await unlink(filterFile).catch(() => {});
+  }
 }
+async function readGtrkFile(gtrkPath) {
+  return JSON.parse(await readFile2(gtrkPath, "utf8"));
+}
+
+// src/lib/materialize.ts
 function baseFormat(fmt) {
   if (fmt.startsWith("jianying"))
     return "jianying";
@@ -5143,6 +5593,128 @@ var FORMAT_META = {
   fcpxml: { label: "Final Cut (fcpxml)", openHint: (p) => `Final Cut Pro：导入 ${p}` },
   otio: { label: "OpenTimelineIO", openHint: (p) => `用支持 OTIO 的工具打开 ${p}` }
 };
+var isExpired404 = (msg) => /HTTP 404/.test(msg);
+function gtrkSourceName(gtrk) {
+  const p = gtrk.materials?.[0]?.path;
+  if (!p)
+    return;
+  const b = basename4(p);
+  const dot = b.lastIndexOf(".");
+  return dot > 0 ? b.slice(0, dot) : b;
+}
+async function materializeResult(opts) {
+  const { outDir, output, taskId } = opts;
+  const dl = opts.download ?? download;
+  const files = output.files ?? [];
+  if (!files.length)
+    throw new Error("任务无工程文件产物（检查 project_formats / 任务是否产出）");
+  const errors = { ...output.errors ?? {} };
+  await mkdir3(outDir, { recursive: true });
+  const resultPath = join11(outDir, "result.json");
+  const writeResult = async (extra) => {
+    const r = {
+      ok: Object.keys(errors).length === 0,
+      outDir,
+      files: {},
+      jianyingDraftPath: null,
+      rendered: null,
+      report: output.report ?? null,
+      errors,
+      taskId,
+      fileId: opts.fileId ?? null,
+      ...extra
+    };
+    await writeFile4(resultPath, JSON.stringify(r, null, 2));
+    return r;
+  };
+  await writeResult({});
+  log.step("拉回产物到本地…");
+  const byFormat = {};
+  for (const f of files) {
+    const base = baseFormat(f.format);
+    const fmtDir = join11(outDir, base);
+    await mkdir3(fmtDir, { recursive: true });
+    const dest = join11(fmtDir, f.filename);
+    try {
+      await dl(f.download_url, dest);
+      (byFormat[base] ??= []).push(dest);
+      log.info(`${FORMAT_META[base]?.label ?? f.format} ← ${f.filename}`);
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : String(e);
+      errors[`${f.format}:${f.filename}`] = msg;
+      if (isExpired404(msg))
+        log.warn(`产物已过期（${f.filename}）：文件已被清理，报告仍可用`);
+      else
+        log.warn(`产物下载失败（${f.filename}）：${msg}`);
+    }
+  }
+  let jianyingDraftPath = null;
+  if (byFormat.jianying && opts.draftDir) {
+    try {
+      jianyingDraftPath = join11(opts.draftDir, basename4(outDir));
+      await mkdir3(jianyingDraftPath, { recursive: true });
+      await cp(join11(outDir, "jianying"), jianyingDraftPath, { recursive: true });
+      log.info(`剪映草稿已落到：${jianyingDraftPath}`);
+    } catch (e) {
+      jianyingDraftPath = null;
+      errors["jianying:draft"] = e instanceof Error ? e.message : String(e);
+      log.warn(`剪映草稿落盘失败：${errors["jianying:draft"]}`);
+    }
+  }
+  let rendered = null;
+  if (opts.render) {
+    const gtrkPath = (byFormat.gtrk ?? [])[0];
+    if (!gtrkPath) {
+      log.warn("已请求 --render，但无可用 gtrk 工程（未产出或已过期），跳过渲染；报告仍已落盘");
+    } else {
+      log.step("本地渲染成片（ffmpeg）…");
+      const project = await readGtrkFile(gtrkPath);
+      const name = opts.projName ?? gtrkSourceName(project) ?? taskId;
+      const outMp4 = join11(outDir, `${name}.mp4`);
+      const r = await renderGtrk(project, outMp4, {
+        crf: opts.crf != null ? Number(opts.crf) : undefined,
+        codec: opts.codec,
+        ffmpegPath: opts.ffmpegPath,
+        onLine: (l) => {
+          const m = l.match(/time=(\S+)/);
+          if (m)
+            log.tick(`渲染中 ${m[1]}`);
+        }
+      });
+      log.tickEnd();
+      rendered = r.outputPath;
+      log.info(`成片：${rendered}（${r.duration.toFixed(1)}s）`);
+    }
+  }
+  const result = await writeResult({ files: byFormat, jianyingDraftPath, rendered });
+  if (!opts.json) {
+    if (Object.keys(byFormat).length)
+      log.step("三方打开（产物已就位，按需自取）：");
+    for (const base of Object.keys(byFormat)) {
+      const meta = FORMAT_META[base];
+      const target = base === "jianying" ? jianyingDraftPath ?? join11(outDir, "jianying") : byFormat[base][0];
+      console.log(`   • ${meta?.label ?? base}：${meta?.openHint(target) ?? target}`);
+    }
+    if (rendered)
+      console.log(`   • 成片 (mp4)：${rendered}`);
+    console.log(`   • 结果清单：${resultPath}`);
+  }
+  if (opts.open) {
+    openFolder(outDir);
+    log.info("已打开产物目录文件夹");
+  }
+  if (opts.json)
+    console.log(JSON.stringify(result));
+  return result;
+}
+
+// src/commands/oralcut.ts
+var TASK_TYPE = "cli/video_oral_cut_for_cli";
+function timestamp() {
+  const d = new Date;
+  const p = (n) => String(n).padStart(2, "0");
+  return `${p(d.getFullYear() % 100)}${p(d.getMonth() + 1)}${p(d.getDate())}-${p(d.getHours())}${p(d.getMinutes())}${p(d.getSeconds())}`;
+}
 var collectParam = (v, acc) => {
   acc.push(v);
   return acc;
@@ -5179,7 +5751,7 @@ function parseExtraParams(pairs, jsonStr) {
   return out;
 }
 function registerOralCut(program2) {
-  program2.command("oralcut <input>").description("智能口播剪辑闭环：上传毛片 → 云端剪辑 → 拉回 gtrk/剪映/PR 工程文件 → 打开").option("-s, --script <file>", "文稿 txt 路径（缺省走无稿智能重建）").option("-p, --preset <preset>", "节奏预设 steady|concise|compact", "concise").option("-o, --out <dir>", "工程产物目录（缺省 = <毛片同目录>/<毛片名>-video-project-<YYMMDD-HHMMSS>）").option("-f, --formats <list>", "三方格式（逗号分隔）", "gtrk,jianying,xml").option("--jianying-draft-dir <dir>", "剪映草稿根目录；传路径或 auto（默认读 gtrk init 配置 / 自动探测）").option("--lang <code>", "语言代码（默认 zh-CN；如 en-US / ja-JP）").option("--visual-assist", "视觉兜底：ASR 漏字时用人脸/说话检测保护并重识别（剪不准/怕剪掉真内容时开）").option("--no-adaptive-rhythm", "关闭自适应节奏（默认开；关了改用固定标点停顿表）").option("--render", "额外渲染成片视频（outputs 加 video）").option("--crf <n>", "视频质量 CRF 14-28（越小越清晰/文件越大，默认 18；需配 --render）").option("--codec <c>", "视频编码（默认 h264；需配 --render）").option("--param <k=v>", "透传任意云端参数（标量、可重复；如 --param intra_gap_max=0.4 --param visual_assist=true）", collectParam, []).option("--params-json <json>", `透传任意云端参数（JSON 对象、支持嵌套；如 '{"punctuation_breaks":{"。":0.3},"render":{"crf":20}}'）`).option("--reupload", "强制重新上传，忽略本地上传缓存（毛片改了但指纹意外没变时用）").option("--no-open", "完成后不自动打开产物目录（默认会自动打开，省得你找文件去哪了）").option("--json", "机读模式：人读日志转 stderr，stdout 只输出结果 JSON（给 agent/脚本解析）").action(async (input, opts) => {
+  program2.command("oralcut <input>").description("智能口播剪辑闭环：本地抽音频/720p → 只传抽出物 → 云端剪辑 → 拉回 gtrk/剪映/PR →（可选）本地渲染").option("-s, --script <file>", "文稿 txt 路径（缺省走无稿智能重建）").option("-p, --preset <preset>", "节奏预设 steady|concise|compact", "concise").option("-o, --out <dir>", "工程产物目录（缺省 = <毛片同目录>/<毛片名>-video-project-<YYMMDD-HHMMSS>）").option("-f, --formats <list>", "三方格式（逗号分隔）", "gtrk,jianying,xml").option("--jianying-draft-dir <dir>", "剪映草稿根目录；传路径或 auto（默认读 gtrk init 配置 / 自动探测）").option("--lang <code>", "语言代码（默认 zh-CN；如 en-US / ja-JP）").option("--visual-assist", "视觉兜底：本地改传 720p 代理，云端用人脸/说话检测保护并重识别（剪不准/怕剪掉真内容时开）").option("--no-adaptive-rhythm", "关闭自适应节奏（默认开；关了改用固定标点停顿表）").option("--render", "额外本地渲染成片（ffmpeg 按 gtrk EDL 出 mp4；毛片仍不出本地）").option("--crf <n>", "本地渲染视频质量 CRF 14-28（越小越清晰/文件越大，默认 18；需配 --render）").option("--codec <c>", "本地渲染视频编码（默认 h264；需配 --render）").option("--ffmpeg-path <dir>", "指定 ffmpeg/ffprobe 所在目录（缺省 ~/.gitruck/ffmpeg → 系统 PATH）").option("--param <k=v>", "透传任意云端参数（标量、可重复；如 --param intra_gap_max=0.4）", collectParam, []).option("--params-json <json>", `透传任意云端参数（JSON 对象、支持嵌套；如 '{"punctuation_breaks":{"。":0.3}}'）`).option("--reupload", "强制重新上传，忽略本地上传缓存").option("--no-open", "完成后不自动打开产物目录（默认会自动打开）").option("--json", "机读模式：人读日志转 stderr，stdout 只输出结果 JSON（给 agent/脚本解析）").action(async (input, opts) => {
     await runOralCut(input, opts);
   });
 }
@@ -5188,42 +5760,51 @@ async function runOralCut(input, opts) {
     routeLogsToStderr();
   const cfg = loadConfig();
   const inputAbs = resolve3(input);
-  if (!existsSync8(inputAbs))
+  if (!existsSync11(inputAbs))
     throw new Error(`毛片不存在：${inputAbs}`);
-  const projName = basename3(inputAbs, extname(inputAbs));
+  const projName = basename5(inputAbs, extname2(inputAbs));
   const formats = opts.formats.split(",").map((s) => s.trim()).filter(Boolean);
+  if (opts.render && !formats.includes("gtrk"))
+    formats.push("gtrk");
   const wantJianying = formats.some((f) => f === "jianying" || f === "capcut");
-  const outDir = resolve3(opts.out ?? join8(dirname2(inputAbs), `${projName}-video-project-${timestamp()}`));
-  await mkdir2(outDir, { recursive: true });
+  const outDir = resolve3(opts.out ?? join12(dirname2(inputAbs), `${projName}-video-project-${timestamp()}`));
   let scriptPath = opts.script ? resolve3(opts.script) : undefined;
   if (!scriptPath) {
-    const sibling = join8(dirname2(inputAbs), `${projName}.txt`);
-    if (existsSync8(sibling)) {
+    const sibling = join12(dirname2(inputAbs), `${projName}.txt`);
+    if (existsSync11(sibling)) {
       scriptPath = sibling;
       log.info(`自动识别到同名文稿：${sibling}（按有稿剪辑；不想用就改名或显式 --script）`);
     }
   }
-  const script = scriptPath ? await readFile2(scriptPath, "utf8") : undefined;
+  const script = scriptPath ? await readFile3(scriptPath, "utf8") : undefined;
   let draftDir;
   if (wantJianying) {
     draftDir = resolveJianyingDraftDir(opts.jianyingDraftDir);
     if (draftDir)
       log.info(`剪映草稿目录：${draftDir}`);
     else
-      log.warn("没找到剪映草稿目录（剪映/CapCut 未装在标准位置）→ 将只产 draft_content.json、缺 meta，剪映无法直接打开。可加 --jianying-draft-dir <你的草稿目录> 重跑。");
+      log.warn("没找到剪映草稿目录 → 将只产 draft_content.json、缺 meta。可加 --jianying-draft-dir <你的草稿目录> 重跑。");
   }
-  log.step(`▶ 智能口播剪辑：${basename3(inputAbs)}（预设 ${opts.preset}${opts.visualAssist ? " · 视觉兜底" : ""}，格式 ${formats.join("/")}）`);
+  log.step(`▶ 智能口播剪辑：${basename5(inputAbs)}（预设 ${opts.preset}${opts.visualAssist ? " · 视觉兜底(720p)" : ""}，格式 ${formats.join("/")}${opts.render ? " · 本地渲染" : ""}）`);
   const extraParams = parseExtraParams(opts.param, opts.paramsJson);
-  log.step("① 上传毛片到云端…");
-  let up = await uploadCached(cfg, inputAbs, { force: opts.reupload });
+  log.step("① 本地预处理（探几何 + 抽音频/720p）…");
+  const geo = probeGeometry(inputAbs, opts.ffmpegPath);
+  log.info(`原片几何 ${geo.width}x${geo.height} @ ${geo.fps.toFixed(2)}fps · ${geo.duration.toFixed(1)}s`);
+  const artifact = opts.visualAssist ? await compress720p(inputAbs, opts.ffmpegPath) : await extractAudio(inputAbs, opts.ffmpegPath);
+  assertDurationConsistent(geo.duration, artifact, opts.ffmpegPath);
+  log.info(opts.visualAssist ? `已压 720p 代理（上传物）：${basename5(artifact)}` : `已抽 16k 单声道 mp3（上传物）：${basename5(artifact)}`);
+  log.step("② 上传抽出物到云端…");
+  let up = await uploadCached(cfg, artifact, { force: opts.reupload });
   log.info(up.cached ? `命中上传缓存，复用 file_id = ${up.fileId}（免二次上传）` : `file_id = ${up.fileId}`);
   const buildPayload = (fid) => {
     const p = {
       file_id: fid,
       la: opts.lang ?? "zh-CN",
-      outputs: opts.render ? ["project", "video"] : ["project"],
       project_formats: formats,
       source_path: inputAbs,
+      video_size: [geo.width, geo.height],
+      video_rate: geo.fps,
+      video_duration: geo.duration,
       rhythm_preset: opts.preset
     };
     if (script)
@@ -5234,15 +5815,6 @@ async function runOralCut(input, opts) {
       p.visual_assist = true;
     if (opts.adaptiveRhythm === false)
       p.adaptive_rhythm = false;
-    if (opts.render) {
-      const r = {};
-      if (opts.crf != null)
-        r.crf = Number(opts.crf);
-      if (opts.codec)
-        r.codec = opts.codec;
-      if (Object.keys(r).length)
-        p.render = r;
-    }
     for (const [k, v] of Object.entries(extraParams)) {
       const cur = p[k];
       const bothObj = !!cur && !!v && typeof cur === "object" && typeof v === "object" && !Array.isArray(cur) && !Array.isArray(v);
@@ -5250,82 +5822,101 @@ async function runOralCut(input, opts) {
     }
     return p;
   };
-  log.step("② 提交智能口播剪辑任务…");
+  log.step("③ 提交智能口播剪辑任务…");
   let taskId;
   try {
     taskId = await submitTask(cfg, TASK_TYPE, buildPayload(up.fileId));
   } catch (e) {
     if (up.cached && e instanceof CloudError && e.code === 6004) {
       log.warn("缓存的 file_id 在云端已失效，重新上传后重试…");
-      await invalidateUpload(inputAbs);
-      up = await uploadCached(cfg, inputAbs, { force: true });
+      await invalidateUpload(artifact);
+      up = await uploadCached(cfg, artifact, { force: true });
       taskId = await submitTask(cfg, TASK_TYPE, buildPayload(up.fileId));
     } else
       throw e;
   }
   log.info(`task_id = ${taskId}`);
-  log.step("③ 云端处理中（每 5s 轮询）…");
+  await mkdir4(outDir, { recursive: true });
+  await writeFile5(join12(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) => {
     log.tick(`${status}${progress != null ? ` ${Math.round(progress)}%` : ""}`);
   });
   log.tickEnd();
-  const files = result.files ?? [];
-  if (!files.length)
-    throw new Error("任务完成但无工程文件产物（检查 project_formats）");
-  log.step(`④ 拉回 ${files.length} 个产物到本地…`);
-  const byFormat = {};
-  for (const f of files) {
-    const base = baseFormat(f.format);
-    const fmtDir = join8(outDir, base);
-    await mkdir2(fmtDir, { recursive: true });
-    const dest = join8(fmtDir, f.filename);
-    await download(f.download_url, dest);
-    (byFormat[base] ??= []).push(dest);
-    log.info(`${FORMAT_META[base]?.label ?? f.format} ← ${f.filename}`);
-  }
-  if (result.errors && Object.keys(result.errors).length) {
-    log.warn(`部分产物失败：${JSON.stringify(result.errors)}`);
-  }
-  let jianyingDraftPath;
-  if (byFormat.jianying && draftDir) {
-    jianyingDraftPath = join8(draftDir, basename3(outDir));
-    await mkdir2(jianyingDraftPath, { recursive: true });
-    await cp(join8(outDir, "jianying"), jianyingDraftPath, { recursive: true });
-    log.info(`剪映草稿已落到：${jianyingDraftPath}`);
-  }
-  if (!opts.json) {
-    log.step("⑤ 三方打开（产物已就位，按需自取）：");
-    for (const base of Object.keys(byFormat)) {
-      const meta = FORMAT_META[base];
-      const target = base === "jianying" ? jianyingDraftPath ?? join8(outDir, "jianying") : byFormat[base][0];
-      console.log(`   • ${meta?.label ?? base}：${meta?.openHint(target) ?? target}`);
+  await materializeResult({
+    outDir,
+    output: result,
+    taskId,
+    fileId: up.fileId,
+    draftDir,
+    render: opts.render,
+    crf: opts.crf,
+    codec: opts.codec,
+    ffmpegPath: opts.ffmpegPath,
+    projName,
+    json: opts.json,
+    open: opts.open
+  });
+  log.ok(`闭环完成。产物目录：${outDir}`);
+}
+
+// src/commands/oralcut-result.ts
+import { resolve as resolve4, join as join13 } from "node:path";
+var TASK_TYPE2 = "cli/video_oral_cut_for_cli";
+function timestamp2() {
+  const d = new Date;
+  const p = (n) => String(n).padStart(2, "0");
+  return `${p(d.getFullYear() % 100)}${p(d.getMonth() + 1)}${p(d.getDate())}-${p(d.getHours())}${p(d.getMinutes())}${p(d.getSeconds())}`;
+}
+function registerOralCutResult(program2) {
+  program2.command("oralcut-result <taskId>").description("按 task_id 取回已完成任务的报告 + 三方工程产物（可选 --render），不重跑云端").option("-o, --out <dir>", "产物目录（缺省 = <当前目录>/<taskId>-video-project-<时间戳>）").option("--render", "额外本地渲染成片（需原毛片仍在 gtrk 内嵌路径 + ffmpeg）").option("--crf <n>", "本地渲染 CRF 14-28（默认 18；需配 --render）").option("--codec <c>", "本地渲染编码（默认 h264；需配 --render）").option("--ffmpeg-path <dir>", "指定 ffmpeg/ffprobe 目录（缺省 ~/.gitruck/ffmpeg → 系统）").option("--jianying-draft-dir <dir>", "剪映草稿根目录；传路径或 auto（默认读配置 / 自动探测）").option("--no-open", "完成后不自动打开产物目录（默认会自动打开）").option("--json", "机读模式：人读日志转 stderr，stdout 只输出结果 JSON（给 agent/脚本解析）").action(async (taskId, opts) => {
+    await runOralCutResult(taskId, opts);
+  });
+}
+async function runOralCutResult(taskId, opts) {
+  if (opts.json)
+    routeLogsToStderr();
+  const cfg = loadConfig();
+  log.step(`▶ 按 task_id 取回口播剪辑结果：${taskId}`);
+  let got;
+  try {
+    got = await getTaskResult(cfg, TASK_TYPE2, taskId);
+  } catch (e) {
+    if (e instanceof CloudError) {
+      throw new Error(`取任务结果失败（code=${e.code}）：${e.message}。` + `注意：取结果需用「提交该任务的同一账号」的 API Key；异账号或已删任务会报 TASK_NOT_FOUND。`);
     }
+    throw e;
   }
-  if (opts.open) {
-    openFolder(outDir);
-    log.info("已打开产物目录文件夹");
-  }
-  log.ok(`闭环完成。产物目录：${outDir}`);
-  if (opts.json) {
-    const errors = result.errors ?? {};
-    console.log(JSON.stringify({
-      ok: Object.keys(errors).length === 0,
-      outDir,
-      files: byFormat,
-      jianyingDraftPath: jianyingDraftPath ?? null,
-      report: result.report ?? null,
-      errors,
-      taskId,
-      fileId: up.fileId
-    }));
+  if (got.status !== "completed") {
+    if (got.status === "failed" || got.status === "cancelled") {
+      const out = got.output;
+      throw new Error(`任务未成功（${got.status}）：${out?.error ?? "无产物可取回"}`);
+    }
+    const pct = got.progress != null ? ` ${Math.round(got.progress)}%` : "";
+    throw new Error(`任务尚未完成（当前 ${got.status || "未知"}${pct}），暂无法取回结果；请稍后再试。`);
   }
+  const outDir = resolve4(opts.out ?? join13(process.cwd(), `${taskId}-video-project-${timestamp2()}`));
+  const draftDir = resolveJianyingDraftDir(opts.jianyingDraftDir);
+  await materializeResult({
+    outDir,
+    output: got.output,
+    taskId,
+    draftDir,
+    render: opts.render,
+    crf: opts.crf,
+    codec: opts.codec,
+    ffmpegPath: opts.ffmpegPath,
+    json: opts.json,
+    open: opts.open
+  });
+  log.ok(`已取回。产物目录：${outDir}`);
 }
 
 // src/commands/upgrade.ts
-import { spawnSync as spawnSync2 } from "node:child_process";
+import { spawnSync as spawnSync3 } from "node:child_process";
 var CLIENT_UPGRADE = "irm https://api.ai-mcn.tv:9000/broadcast/exe/install.ps1 | iex";
 function run(cmd) {
-  const r = spawnSync2(cmd, { stdio: "inherit", shell: true });
+  const r = spawnSync3(cmd, { stdio: "inherit", shell: true });
   return r.status ?? 1;
 }
 function registerUpgrade(program2) {
@@ -5363,19 +5954,55 @@ function registerUpgrade(program2) {
   });
 }
 
+// src/commands/render.ts
+import { resolve as resolve5, dirname as dirname3, join as join14, basename as basename6, extname as extname3 } from "node:path";
+import { existsSync as existsSync12 } 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 = resolve5(gtrk);
+    if (!existsSync12(gtrkAbs))
+      throw new Error(`gtrk 工程不存在：${gtrkAbs}`);
+    const outMp4 = resolve5(opts.out ?? join14(dirname3(gtrkAbs), `${basename6(gtrkAbs, extname3(gtrkAbs))}.mp4`));
+    log.step(`▶ 本地渲染：${basename6(gtrkAbs)} → ${basename6(outMp4)}`);
+    const project = await readGtrkFile(gtrkAbs);
+    const result = await renderGtrk(project, outMp4, {
+      crf: opts.crf != null ? Number(opts.crf) : undefined,
+      codec: opts.codec,
+      ffmpegPath: opts.ffmpegPath,
+      onLine: (l) => {
+        const m = l.match(/time=(\S+)/);
+        if (m)
+          log.tick(`渲染中 ${m[1]}`);
+      }
+    });
+    log.tickEnd();
+    log.ok(`渲染完成：${outMp4}（${result.duration.toFixed(1)}s）`);
+    if (opts.open)
+      openFolder(dirname3(outMp4));
+    if (opts.json) {
+      console.log(JSON.stringify({ ok: true, output: outMp4, duration: result.duration }));
+    }
+  });
+}
+
 // src/index.ts
 try {
   process.loadEnvFile?.();
 } catch {}
-var { version } = JSON.parse(readFileSync3(join9(packageRoot(), "package.json"), "utf8"));
+migrateLegacyHome();
+var { version } = JSON.parse(readFileSync3(join15(packageRoot(), "package.json"), "utf8"));
 var program2 = new Command;
 program2.name("gtrk").description("同合云成片流水线 CLI —— agent 驱动云端任务、产物拉回本地、三方工程文件（客户端/剪映/PR）互通").version(version);
 registerInstall(program2);
 registerInit(program2);
 registerOralCut(program2);
+registerOralCutResult(program2);
 registerDoctor(program2);
 registerSkills(program2);
 registerUpgrade(program2);
+registerRender(program2);
 program2.parseAsync(process.argv).catch((e) => {
   console.error(`
 ❌ ${e instanceof Error ? e.message : String(e)}`);