@remixmate/cli 0.9.48 → 0.9.50

package/dist/manifest.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
-  "version": "0.9.48",
-  "generatedAt": "2026-09-24T03:37:24.431Z",
+  "version": "0.9.50",
+  "generatedAt": "2026-09-27T01:55:22.557Z",
   "skills": [
     {
       "id": "doc-parse",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remixmate/cli",
-  "version": "0.9.48",
+  "version": "0.9.50",
   "description": "AI media generation skills for Claude Code / Codex — 12 skills covering image, video, voice, digital human, web screenshot, web recording, script, template registry, rendering, Jianying export, and video deconstruction.",
   "type": "module",
   "main": "dist/index.js",

package/skills/render-video/scripts/render_video.py

@@ -1873,6 +1873,11 @@ def _persist_plan_checkpoint(render_plan: dict, job_id: Optional[int], private_t
         LogPrint(f"   ⚠️  RenderPlan checkpoint failed (jobId={job_id}): {exc}", file=sys.stderr)
 
 
+
+def _builtin_dynamic_render_enabled() -> bool:
+    """内置模板是否也走 /renderDraft（Phase 3b 路由翻转开关，默认关）。"""
+    return os.environ.get("REMIXMATE_BUILTIN_DYNAMIC_RENDER", "").strip().lower() in {"1", "true", "yes", "on"}
+
 def render_with_remote_api(
     render_plan: dict,
     output_path: str,
@@ -1931,19 +1936,23 @@ def render_with_remote_api(
         cover_composition_id = resolve_cover_composition_id(template_id)
 
     # ─── 私有模板路由 ────────────────────────────────────────────────────
-    # 仅【用户私有模板】(isBuiltin=false 且带 sourceOssKey) 源码在 OSS、不在
-    # ab-render 启动 bundle，需走动态渲染：presignSource 取临时 GET URL → /renderDraft。
-    # 内置模板即使带 sourceOssKey（builtin-template-registry 回填，仅服务
-    # derive_template 派生），渲染仍走 ab-render 预构建的 /render，绝不走 /renderDraft，
-    # 否则会用 OSS 上的旧快照 + DraftMainVideo 复刻渲染，与生产 MainVideo 漂移。
-    # 下面这套 payload 构造在"续跑既有任务"时其实用不上（见后面的 resuming 分支），
-    # 所以它的失败不该让续跑也跟着失败 —— 任务还在后端好好渲着。
+    # 仅【用户私有模板】(isBuiltin=false 且 hasSource) 源码在 OSS、不在
+    # ab-render 启动 bundle，需走动态渲染：/renderDraft {templateKey}，ab-render 服务端取包。
+    # 内置模板即使带 sourceOssKey（admin 调用时 registry 才会输出），渲染仍走 ab-render
+    # 预构建的 /render，绝不走 /renderDraft，否则会用 OSS 上的旧快照 + DraftMainVideo
+    # 复刻渲染，与生产 MainVideo 漂移。
     pending_resume = bool(str(render_plan.get("remoteTaskId") or "").strip())
-    # 先给默认值：presign 失败时下面的分支不会走到，续跑分支仍要读 status_path。
     render_path = "/render"
     status_path = "/renderStatus"
 
     source_oss_key = None
+    # 内置模板是否也走动态渲染（Phase 3b 路由翻转，ab-platform/docs/
+    # template-authoring-page-review.md §7.2）。默认关：翻转依赖 ab-render 以服务身份取
+    # 内置源码（DRAFT_BUILTIN_SOURCE_TOKEN ↔ ab-api ab_render.service_token），服务端没配好
+    # 就打开，普通用户渲染内置模板会全部失败。服务端就绪后设 REMIXMATE_BUILTIN_DYNAMIC_RENDER=1；
+    # 回退 = 取消该变量，内置模板回到 /render。
+    builtin_dynamic = _builtin_dynamic_render_enabled()
+    is_builtin_dynamic = False
     template_id = render_plan.get("templateId", "")
     if template_id:
         try:
@@ -1953,35 +1962,21 @@ def render_with_remote_api(
             # 是另一个模板的画面。
             _meta = get_template(template_id, include_all_statuses=True)
             if _meta and not _meta.get("isBuiltin"):
-                source_oss_key = _meta.get("sourceOssKey")
+                source_oss_key = _meta.get("hasSource")
+            elif _meta and builtin_dynamic:
+                # 内置模板：客户端拿不到也不需要 sourceOssKey（源码保护），只要知道
+                # 它在 registry 里；ab-render 按 templateKey 以服务身份取包。
+                source_oss_key = True
+                is_builtin_dynamic = True
         except Exception:
             source_oss_key = None
 
     if source_oss_key:
-        import render_job_client  # type: ignore
-        tarball_url = None
-        try:
-            src = render_job_client.presign_template_source(template_id, private_token)
-            tarball_url = src.get("tarballUrl")
-            if not tarball_url:
-                raise RuntimeError(f"presignSource 未返回 tarballUrl: {src}")
-        except Exception as exc:
-            if pending_resume:
-                LogPrint(
-                    f"⚠️  presignSource failed ({exc}) — 但有待续跑的任务，忽略继续",
-                    file=sys.stderr,
-                )
-            else:
-                LogPrint(f"❌ presignSource failed for private template {template_id}: {exc}", file=sys.stderr)
-                render_plan["status"] = "failed"
-                render_plan["errors"].append({
-                    "phase": "render",
-                    "message": f"presignSource failed: {exc}",
-                    "timestamp": now_iso(),
-                })
-                return False
+        # 只传 templateKey：由 ab-render 带本次的 X-Priv-Token 向 ab-api 换源码包 URL
+        # 并自行下载（所有权校验在 ab-api）。源码包 URL 不经过客户端 ——
+        # 见 ab-platform/docs/template-source-protection-design.md §4.3。
         payload = {
-            "tarballUrl": tarball_url,
+            "templateKey": template_id,
             "inputProps": input_props,
             "upload": True,
             "uploadTitle": effective_title,
@@ -1991,6 +1986,10 @@ def render_with_remote_api(
         # 不传则 ab-render 退回截首帧 / 不渲。
         if cover_composition_id:
             payload["coverCompositionId"] = cover_composition_id
+        if is_builtin_dynamic:
+            # 与预构建 /render 的 MainVideo 语义对齐：不把 entry.props 摊平到顶层
+            # （摊平会让同名键覆盖平台注入的 typography / variantId 等）。
+            payload["spreadEntryProps"] = False
         render_path = "/renderDraft"
         status_path = "/renderDraftStatus"
     else:
@@ -2009,6 +2008,8 @@ def render_with_remote_api(
     if pending_resume:
         # 续跑：下面那堆"正在提交"的日志会误导人，跳过
         LogPrint(f"🎬 Remote render task already exists, will resume polling", file=sys.stderr)
+    elif is_builtin_dynamic:
+        LogPrint(f"   Builtin template (dynamic bundle): {template_id}", file=sys.stderr)
     elif source_oss_key:
         LogPrint(f"   Private template (OSS dynamic bundle): {template_id}", file=sys.stderr)
     else:

package/skills/render-video/version.json

@@ -2,6 +2,6 @@
   "skillName": "render-video",
   "repoName": "agent-skill-media-maker",
   "skillId": "473",
-  "version": "V28",
+  "version": "V30",
   "skillDescription": "Final-render skill: loads a persisted RenderPlan by `job_id` and drives the Remotion engine to produce the final video.\n\nUse this skill as soon as the user mentions any of these intents (after assets are already prepared):\n- Render the video, composite the video, export the video\n- Turn the prepared assets into the final clip\n- Render with Remotion\n\nPrerequisite: assets must already be generated via `prepare_video_assets`. This skill never resolves or regenerates assets — pass it a `job_id` from a previous `prepare_video_assets` call.\n\n⚠️ Stop-and-confirm gate: never call this skill until the user has explicitly confirmed the assets prepared by `prepare_video_assets`. If those assets were prepared in the current turn and the user has not replied since, stop and ask instead of rendering."
 }

package/skills/template-registry/scripts/render_job_client.py

@@ -186,18 +186,6 @@ def get_job(job_id: int, priv_token: str) -> dict:
     return _post("/renderJob/get", {"jobId": job_id}, priv_token)
 
 
-def presign_template_source(template_key: str, priv_token: str) -> dict:
-    """
-    为已注册私有模板的源码包申请临时 GET 下载 URL（渲染取包用）。
-
-    调 ab-api /remotionTemplate/presignSource，返回 { tarballUrl, sourceOssKey, version }。
-    ab-render 用 tarballUrl 走 /renderDraft 动态 bundle 渲染。
-
-    注意：presignSource 端点不在 /renderJob 下，路径以 / 开头直接拼到 _api_base。
-    """
-    return _post("/remotionTemplate/presignSource", {"templateKey": template_key}, priv_token)
-
-
 # ─── CLI self-test ────────────────────────────────────────────────────────────
 
 if __name__ == "__main__":

package/skills/template-registry/version.json

@@ -2,6 +2,6 @@
   "skillName": "template-registry",
   "repoName": "agent-skill-media-maker",
   "skillId": "475",
-  "version": "V21",
+  "version": "V22",
   "skillDescription": "Video-template registry skill. Stores every video-template definition and lists the available templates (templateId / name / aspect ratio / style tags).\n\nUse this skill as soon as the user mentions any of these intents:\n- View available templates / list every template\n\nNote: DSL→TemplateBinding is no longer a separate exposed step — once prepare_video_assets receives a template_id it builds the binding internally."
 }