dsh-motion 0.4.0 → 0.4.1

package/README.md

@@ -14,7 +14,7 @@
 |---|---|
 | `motion_frames` | **极简模式（默认）**：直接从场景出帧，不生成视频、不用 HF；几秒拿到 storyboard PNG 与 layout 问题 |
 | `motion_doctor` | 环境自检（Node / FFmpeg / Python venv / manimgx / sympy / Chrome / HyperFrames） |
-| `motion_render` | 渲染 Manim / manimgx 场景，可加运动模糊、颗粒、暗角、调色 |
+| `motion_render` | 渲染 Manim / manimgx 场景；未通过 `APPROVALS.json` 确认门的项目会拒绝渲染 |
 | `motion_probe` | 成片抽帧拼 contact sheet，报告全黑 / 过曝的空镜 |
 | `formula_check` | 用 SymPy 判断两个表达式是否恒等 |
 
@@ -77,6 +77,8 @@
 5. 交付清单（尺寸 / fps / 时长 / 文件 / 音频 / 字幕）
 6. **用户明确说“可以开始 / 开始做 / 按这个执行”**
 
+`motion_render` 会读项目里的 `APPROVALS.json`；没有，或 `delivery` / `start` 等阶段未全部 approved，直接报错，不会偷偷渲染。
+
 没听到第 6 步的明确指令，不写完整场景、不出全片。清单模板见
 [skills/animation-router/references/confirmation.md](skills/animation-router/references/confirmation.md)。
 

package/lib/approvals.js

@@ -0,0 +1,60 @@
+/**
+ * 读取项目里的 APPROVALS.json，供工具层做“开工确认”硬门。
+ *
+ * 脚本 scripts/approvals.mjs 负责写；这里只读，避免模型绕过。
+ */
+import { existsSync, readFileSync } from 'node:fs'
+import { dirname, join, resolve } from 'node:path'
+
+const FILE = 'APPROVALS.json'
+
+export function findApprovals(file) {
+  let dir = dirname(resolve(file))
+  for (let i = 0; i < 4; i += 1) {
+    const candidate = join(dir, FILE)
+    if (existsSync(candidate)) return candidate
+    const parent = dirname(dir)
+    if (parent === dir) break
+    dir = parent
+  }
+  return null
+}
+
+export function readApprovals(file) {
+  const path = findApprovals(file)
+  if (!path) return { status: 'missing', path: null, missing: [], mode: null }
+  const data = JSON.parse(readFileSync(path, 'utf8'))
+  const stages = Object.entries(data.stages ?? {})
+  const missing = stages
+    .filter(([, value]) => value.status !== 'approved')
+    .map(([key, value]) => value.label ?? key)
+  return {
+    status: missing.length ? 'pending' : 'approved',
+    path,
+    mode: data.mode ?? null,
+    project: data.project ?? null,
+    missing,
+    data,
+  }
+}
+
+export function assertApproved(file, { allow = false } = {}) {
+  if (allow) return null
+  const report = readApprovals(file)
+  if (report.status === 'missing') {
+    throw new Error(
+      `未找到 ${FILE}：这个项目还没过需求卡点/确认门。\n`
+      + '先跑：node scripts/plan-questions.mjs "<需求>" --json\n'
+      + '再初始化：node scripts/approvals.mjs init <project> --mode light|standard|full\n'
+      + '确认后把 delivery/start 等阶段置为 approved；或设置 DSH_MOTION_ALLOW_UNCONFIRMED=1 仅用于调试。',
+    )
+  }
+  if (report.status === 'pending') {
+    throw new Error(
+      `开工确认未通过（${report.path}）：还缺 ${report.missing.join('、')}。\n`
+      + '用 node scripts/approvals.mjs set <project> <stage> approved --note "用户确认" 更新；\n'
+      + '全部 approved 后才能渲染。',
+    )
+  }
+  return report
+}

package/lib/index.js

@@ -15,6 +15,7 @@ import { appendFileSync, mkdirSync } from 'node:fs'
 import { homedir } from 'node:os'
 import { join } from 'node:path'
 
+import { assertApproved } from './approvals.js'
 import { importFresh } from './fresh.js'
 
 const OPS_URL = new URL('./ops.js', import.meta.url)
@@ -91,7 +92,7 @@ export function apply(ctx, config = {}) {
   ctx.tools.register({
     name: 'motion_render',
     description:
-      '渲染一支数学/科普场景。engine="manimgx"（默认，数学/公式/坐标，无需 LaTeX，自带 layout 检查）或 "manim"（Manim CE 回退）。post 可加运动模糊/颗粒/暗角。返回时长/体积/布局问题清单。',
+      '渲染一支数学/科普场景。engine="manimgx"（默认，数学/公式/坐标，无需 LaTeX，自带 layout 检查）或 "manim"（Manim CE 回退）。post 可加运动模糊/颗粒/暗角。返回时长/体积/布局问题清单。未通过 APPROVALS.json 确认门的项目会拒绝渲染。',
     parameters: {
       type: 'object',
       properties: {
@@ -120,6 +121,9 @@ export function apply(ctx, config = {}) {
     output: textOutput,
     timeoutMs: 900_000,
     async execute(args) {
+      assertApproved(args.file, {
+        allow: config.allowUnconfirmed === true || process.env.DSH_MOTION_ALLOW_UNCONFIRMED === '1',
+      })
       const { renderScene } = await ops()
       const result = await renderScene(config, args)
       log(`render ${result.output} ${result.durationSec}s engine=${result.engine} problems=${result.layoutProblems.length}`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-motion",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Code-generated math & science animations for DeepSeek Harness: frames-first preview, Manim clips, formula checks.",
   "license": "MIT",
   "type": "module",
@@ -17,6 +17,7 @@
     "skills",
     "styles",
     "docs",
+    "scripts",
     "cordis.patch.yml",
     "README.md",
     "LICENSE",

package/scripts/approvals.mjs

@@ -0,0 +1,136 @@
+#!/usr/bin/env node
+/**
+ * 项目级确认记录：把“用户确认过什么”落成可追溯的 APPROVALS.json。
+ *
+ *   node scripts/approvals.mjs init <project> --mode light
+ *   node scripts/approvals.mjs set <project> script_storyboard approved --note "用户确认"
+ *   node scripts/approvals.mjs check <project>
+ *   node scripts/approvals.mjs show <project>
+ *
+ * 模式：
+ *   light    ≤15s、无旁白：需求 → 脚本+分镜 → 视觉 → 开工
+ *   standard 15–60s 或有旁白：需求 → 脚本 → 分镜 → 视觉 → 交付 → 开工
+ *   full     >60s 或多段/复杂旁白：再加 animatic
+ */
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { join, resolve } from 'node:path'
+
+const FILE = 'APPROVALS.json'
+const LABELS = {
+  requirements: '需求',
+  script: '脚本',
+  script_storyboard: '脚本 + 分镜',
+  storyboard: '分镜',
+  animatic: 'Animatic',
+  look: '视觉（DESIGN + 3 帧）',
+  delivery: '交付清单',
+  start: '开工',
+}
+const MODES = {
+  light: ['requirements', 'script_storyboard', 'look', 'start'],
+  standard: ['requirements', 'script', 'storyboard', 'look', 'delivery', 'start'],
+  full: ['requirements', 'script', 'storyboard', 'animatic', 'look', 'delivery', 'start'],
+}
+const STATUSES = new Set(['pending', 'approved', 'rejected'])
+
+function fail(message) {
+  console.error(message)
+  process.exit(1)
+}
+
+function pathOf(project) {
+  return join(resolve(project), FILE)
+}
+
+function read(project) {
+  const file = pathOf(project)
+  if (!existsSync(file)) fail(`找不到 ${file}；先运行 init`)
+  return JSON.parse(readFileSync(file, 'utf8'))
+}
+
+function write(project, data) {
+  const file = pathOf(project)
+  mkdirSync(resolve(project), { recursive: true })
+  writeFileSync(file, JSON.stringify(data, null, 2) + '\n')
+  return file
+}
+
+function init(project, mode) {
+  if (!MODES[mode]) fail(`mode 只能是 ${Object.keys(MODES).join(' / ')}`)
+  const file = pathOf(project)
+  if (existsSync(file)) fail(`${file} 已存在；要重建请先删除`)
+  const stages = {}
+  for (const stage of MODES[mode]) {
+    stages[stage] = { label: LABELS[stage], status: 'pending', at: null, by: null, note: '' }
+  }
+  const data = { version: 1, project: project, mode, createdAt: new Date().toISOString(), stages }
+  write(project, data)
+  console.log(`created ${file} (${mode})`)
+  console.log(`stages: ${MODES[mode].join(' → ')}`)
+}
+
+function set(project, stage, status, options) {
+  if (!STATUSES.has(status)) fail(`status 只能是 ${[...STATUSES].join(' / ')}`)
+  const data = read(project)
+  const order = MODES[data.mode]
+  if (!data.stages[stage]) fail(`${data.mode} 模式没有阶段: ${stage}（有: ${order.join(', ')}）`)
+  if (status === 'approved') {
+    const index = order.indexOf(stage)
+    const missing = order.slice(0, index).filter((key) => data.stages[key].status !== 'approved')
+    if (missing.length) fail(`不能跳过前置阶段: ${missing.map((key) => LABELS[key]).join('、')}`)
+  }
+  data.stages[stage] = {
+    ...data.stages[stage],
+    status,
+    at: new Date().toISOString(),
+    by: options.by ?? 'user',
+    note: options.note ?? data.stages[stage].note ?? '',
+  }
+  write(project, data)
+  console.log(`${stage} → ${status}${options.note ? ` (${options.note})` : ''}`)
+}
+
+function table(data) {
+  const rows = Object.entries(data.stages).map(([key, value]) => {
+    const mark = value.status === 'approved' ? '✅' : value.status === 'rejected' ? '❌' : '⬜'
+    return `${mark} ${value.label.padEnd(14, ' ')} ${value.status.padEnd(8)} ${value.at ?? '-'} ${value.note ?? ''}`
+  })
+  return [`project: ${data.project}  mode: ${data.mode}`, ...rows].join('\n')
+}
+
+function check(project) {
+  const data = read(project)
+  console.log(table(data))
+  const missing = Object.entries(data.stages)
+    .filter(([, value]) => value.status !== 'approved')
+    .map(([key]) => LABELS[key])
+  if (missing.length) {
+    console.error(`\n未确认: ${missing.join('、')}`)
+    process.exit(1)
+  }
+  console.log('\nall approved')
+}
+
+const [command, project, ...rest] = process.argv.slice(2)
+if (!command || !project) fail('用法: node scripts/approvals.mjs init|set|check|show <project> ...')
+
+if (command === 'init') {
+  const modeIndex = rest.indexOf('--mode')
+  const mode = modeIndex >= 0 ? rest[modeIndex + 1] : 'light'
+  init(project, mode)
+} else if (command === 'set') {
+  const [stage, status] = rest
+  const noteIndex = rest.indexOf('--note')
+  const byIndex = rest.indexOf('--by')
+  if (!stage || !status) fail('用法: set <project> <stage> <approved|pending|rejected> [--note ...] [--by ...]')
+  set(project, stage, status, {
+    note: noteIndex >= 0 ? rest[noteIndex + 1] : undefined,
+    by: byIndex >= 0 ? rest[byIndex + 1] : undefined,
+  })
+} else if (command === 'check') {
+  check(project)
+} else if (command === 'show') {
+  console.log(table(read(project)))
+} else {
+  fail(`未知命令: ${command}`)
+}

package/scripts/build-style-index.mjs

@@ -0,0 +1,110 @@
+#!/usr/bin/env node
+/**
+ * 从 styles/<slug>/style.json 生成 styles/README.md 的风格表和 styles/registry.json。
+ *
+ *   node scripts/build-style-index.mjs          # 写入
+ *   node scripts/build-style-index.mjs --check  # 只检查是否过期（CI/smoke 用）
+ *
+ * style.json 是唯一事实来源；表与 registry 不再手写，避免漂移。
+ */
+import { readFileSync, readdirSync, writeFileSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..')
+const STYLES_DIR = join(ROOT, 'styles')
+const README = join(STYLES_DIR, 'README.md')
+const REGISTRY = join(STYLES_DIR, 'registry.json')
+const DESIGN = join(ROOT, 'DESIGN.md')
+
+function defaultStyle() {
+  const match = /^style:\s*(\S+)/m.exec(readFileSync(DESIGN, 'utf8'))
+  if (!match) throw new Error('DESIGN.md 缺少 style:')
+  return match[1]
+}
+
+function loadStyles() {
+  return readdirSync(STYLES_DIR, { withFileTypes: true })
+    .filter((entry) => entry.isDirectory())
+    .map((entry) => {
+      const file = join(STYLES_DIR, entry.name, 'style.json')
+      return JSON.parse(readFileSync(file, 'utf8'))
+    })
+    .sort((a, b) => String(a.num).localeCompare(String(b.num)))
+}
+
+function sourceLabel(style) {
+  const url = `${style.source ?? ''} ${style.secondary_source ?? ''}`
+  if (url.includes('lemomo-ai')) return 'Lemo-Opuscar'
+  if (url.includes('subinium')) return 'subinium + manim_skill'
+  return 'external'
+}
+
+function renderTable(styles) {
+  const lines = [
+    '<!-- styles:start -->',
+    '| 风格 | 适合 | 来源 | 入口 |',
+    '|---|---|---|---|',
+  ]
+  for (const style of styles) {
+    const label = style.slug === 'swiss-motion' ? `${style.cn}（默认）` : style.cn
+    const uses = (style.uses_cn ?? style.uses ?? []).join('、')
+    lines.push(`| \`${style.slug}\` / ${label} | ${uses} | ${sourceLabel(style)} | [STYLE](${style.slug}/STYLE.md) · [tokens](${style.slug}/tokens.json) · [theme](${style.slug}/theme.py) |`)
+  }
+  lines.push('<!-- styles:end -->')
+  return lines.join('\n')
+}
+
+function updateReadme(styles) {
+  const text = readFileSync(README, 'utf8')
+  const start = text.indexOf('<!-- styles:start -->')
+  const end = text.indexOf('<!-- styles:end -->')
+  const block = renderTable(styles)
+  if (start >= 0 && end > start) {
+    return text.slice(0, start) + block + text.slice(end + '<!-- styles:end -->'.length)
+  }
+  return `${text.trimEnd()}\n\n${block}\n`
+}
+
+function buildRegistry(styles) {
+  return {
+    version: 1,
+    generated: true,
+    default: defaultStyle(),
+    styles: styles.map((style) => ({
+      slug: style.slug,
+      num: style.num,
+      name_cn: style.cn,
+      name_en: style.en,
+      category_cn: style.category_cn,
+      uses: style.uses ?? [],
+      uses_cn: style.uses_cn ?? [],
+      keywords: style.keywords ?? [],
+      avoid: style.avoid ?? [],
+      aspect: style.aspect ?? ['16:9'],
+      fps: style.fps ?? 30,
+      complexity: style.complexity ?? 'medium',
+      demo: style.demo ?? null,
+      source: style.source ?? null,
+    })),
+  }
+}
+
+const styles = loadStyles()
+const registry = buildRegistry(styles)
+const readme = updateReadme(styles)
+const registryText = JSON.stringify(registry, null, 2) + '\n'
+
+if (process.argv.includes('--check')) {
+  const stale = readFileSync(README, 'utf8') !== readme
+    || readFileSync(REGISTRY, 'utf8') !== registryText
+  if (stale) {
+    console.error('styles/README.md 或 styles/registry.json 已过期；运行 node scripts/build-style-index.mjs')
+    process.exit(1)
+  }
+  console.log('styles index is up to date')
+} else {
+  writeFileSync(README, readme)
+  writeFileSync(REGISTRY, registryText)
+  console.log(`wrote styles/README.md table and styles/registry.json (${styles.length} styles, default ${registry.default})`)
+}

package/scripts/check-meta.mjs

@@ -0,0 +1,25 @@
+/**
+ * 发布前元数据检查：占位符、私有标记、绝对路径。
+ * 用法：node scripts/check-meta.mjs
+ */
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+
+const pkg = JSON.parse(readFileSync(join(process.cwd(), 'package.json'), 'utf8'))
+const problems = []
+
+if (pkg.private) problems.push('package.json 里 private 仍为 true')
+if (!pkg.license) problems.push('缺少 license')
+if (!pkg.engines?.node) problems.push('缺少 engines.node')
+
+for (const file of ['lib/index.js', 'lib/ops.js', 'lib/env.js', 'lib/doctor.js']) {
+  const text = readFileSync(join(process.cwd(), file), 'utf8')
+  if (/\/Users\/[^\s'"]+/.test(text)) problems.push(`${file} 含绝对路径 /Users/…`)
+}
+
+if (problems.length) {
+  console.error('发布前检查未通过：')
+  for (const p of problems) console.error(` - ${p}`)
+  process.exit(1)
+}
+console.log('元数据检查通过')

package/scripts/dev.mjs

@@ -0,0 +1,68 @@
+#!/usr/bin/env node
+/**
+ * 不经过 Harness 的开发 CLI：直接调用 lib/ops.js。
+ *
+ *   node scripts/dev.mjs frames <scene.py> [t1,t2,...]
+ *   node scripts/dev.mjs render <scene.py> [--fps 30] [--out path]
+ *   node scripts/dev.mjs probe <video.mp4>
+ *   node scripts/dev.mjs doctor
+ */
+import { mkdirSync } from 'node:fs'
+import { basename, dirname, join } from 'node:path'
+
+import { inspectFrames, probeVideo, renderScene } from '../lib/ops.js'
+import { doctor } from '../lib/doctor.js'
+
+const [cmd, file, ...rest] = process.argv.slice(2)
+
+function fail(message) {
+  console.error(message)
+  process.exit(1)
+}
+
+function elapsed(start) {
+  return `${((Date.now() - start) / 1000).toFixed(1)}s`
+}
+
+if (!cmd) fail('用法: node scripts/dev.mjs frames|render|probe|doctor ...')
+
+function outputDir() {
+  mkdirSync('out', { recursive: true })
+  return 'out'
+}
+
+function slugOf(path) {
+  const dir = dirname(path)
+  return dir === '.' ? basename(path, '.py') : basename(dir)
+}
+
+if (cmd === 'frames') {
+  if (!file) fail('缺少场景文件')
+  const times = (rest[0] ?? '').split(',').filter(Boolean)
+  const started = Date.now()
+  const result = await inspectFrames({}, {
+    file,
+    times,
+    out: join(outputDir(), `${slugOf(file)}-frames.png`),
+  })
+  console.log(JSON.stringify({ ...result, elapsed: elapsed(started) }, null, 2))
+} else if (cmd === 'render') {
+  if (!file) fail('缺少场景文件')
+  const fpsIndex = rest.indexOf('--fps')
+  const outIndex = rest.indexOf('--out')
+  const started = Date.now()
+  const result = await renderScene({}, {
+    file,
+    fps: fpsIndex >= 0 ? Number(rest[fpsIndex + 1]) : 30,
+    out: outIndex >= 0 ? rest[outIndex + 1] : join(outputDir(), `${slugOf(file)}.mp4`),
+  })
+  console.log(JSON.stringify({ ...result, elapsed: elapsed(started) }, null, 2))
+} else if (cmd === 'probe') {
+  if (!file) fail('缺少视频文件')
+  const started = Date.now()
+  console.log(JSON.stringify({ ...(await probeVideo({}, { video: file })), elapsed: elapsed(started) }, null, 2))
+} else if (cmd === 'doctor') {
+  console.log(JSON.stringify(await doctor({}), null, 2))
+} else {
+  fail(`未知命令: ${cmd}`)
+}