akari-video 1.1.1 → 1.2.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akari-video",
-  "version": "1.1.1",
+  "version": "1.2.0-beta.1",
   "description": "AKARI Video launcher CLI — start an AI-edited video project from any directory: scaffold, connection check, then hand over to Claude Code (or opencode). AKARI Video を opencode や Claude Code で、どのディレクトリからでも始めるための `akari` ランチャー CLI。接続確認（doctor）→ 未セットアップならプロジェクト雛形を作成 → AI エージェントを起動する。外部 npm 依存ゼロ（Node.js 組み込みモジュールのみ）。",
   "type": "module",
   "bin": {

package/src/doctor-command.mjs

@@ -60,9 +60,14 @@ export function formatDoctorReport(report) {
     '',
     `判定: ${report.verdict}`,
   ];
-  if (report.next_steps.length > 0) {
+  const steps = [...report.next_steps];
+  if (report.cli.node?.runtime === 'electron' && report.cli.node.exec_path && report.render_cut.path) {
+    const quote = (value) => `"${value.replaceAll('"', '\\"')}"`;
+    steps.push(`Node が PATH に無い場合の書き出し: ELECTRON_RUN_AS_NODE=1 ${quote(report.cli.node.exec_path)} ${quote(report.render_cut.path)} <project-root>`);
+  }
+  if (steps.length > 0) {
     lines.push('次の手順:');
-    lines.push(...report.next_steps.map((step) => `  - ${step}`));
+    lines.push(...steps.map((step) => `  - ${step}`));
   }
   return lines.join('\n');
 }

package/src/migrate-command.mjs

@@ -64,11 +64,14 @@ export async function runMigrateCommand(args, options = {}) {
   }
   if (parsed.json) {
     log(JSON.stringify({
-      ok: true, dryRun: parsed.dryRun, version: proposal.version,
+      ok: true, dryRun: parsed.dryRun, version: proposal.emptyProject ? null : proposal.version,
+      ...(proposal.emptyProject ? { emptyProject: true } : {}),
       filePath: proposal.filePath, backupPath: proposal.backupPath, changes: proposal.changes
     }));
   } else {
-    log(`変換対象: ${proposal.filePath} (version ${proposal.version}${proposal.version === 2 ? ' 正規化' : ' -> 2'})`);
+    log(proposal.emptyProject
+      ? `初期化対象: ${proposal.filePath} (空の edit.json -> version 2)`
+      : `変換対象: ${proposal.filePath} (version ${proposal.version}${proposal.version === 2 ? ' 正規化' : ' -> 2'})`);
     for (const change of proposal.changes) log(`- ${change.path}: ${change.note}`);
     log(`変換前の退避先: ${proposal.backupPath}`);
   }
@@ -92,7 +95,9 @@ export async function runMigrateCommand(args, options = {}) {
   }
   await migrate.applyMigration(proposal);
   if (!parsed.json) {
-    log(proposal.version === 2
+    log(proposal.emptyProject
+      ? `空の edit.json を初期化しました。元ファイル: ${proposal.backupPath}`
+      : proposal.version === 2
       ? `version 2 を正規化しました。元ファイル: ${proposal.backupPath}`
       : `version 2 へ変換しました。元ファイル: ${proposal.backupPath}`);
   }

package/vendor/.akari-capability-sources.json

@@ -83,6 +83,8 @@
     "docs/contract-2026-10-02-textstyle-v1-rich.md",
     "docs/contract-2026-10-04-asset-tier-v1.md",
     "docs/contract-2026-10-06-timeline-ripple-v0.md",
+    "packages/akari-ear/package.json",
+    "packages/akari-ear/README.md",
     "packages/akari-launcher/package.json",
     "packages/akari-launcher/README.md",
     "packages/akari-tools/package.json",
@@ -109,6 +111,8 @@
     "packages/frame-engine/package.json",
     "packages/frame-engine/README.ja.md",
     "packages/frame-engine/README.md",
+    "packages/frame-scene/package.json",
+    "packages/frame-scene/README.md",
     "packages/generate/package.json",
     "packages/generate/README.md",
     "packages/gpu-export/package.json",

package/vendor/docs/contract-2026-07-13-asset-library.md

@@ -373,7 +373,7 @@ catalog に載せる素材は、取得元のライセンスが CC0 相当（帰
 
 | v1 category | 形の定義 | 判定 | 旧 category |
 |---|---|---|---|
-| `overlay` | 時間を持つ HTML 断片 | `fragment.html` + `data-start` / `data-duration` を持ち `overlays[]` から合成 | `telop` / `motion` |
+| `overlay` | 時間を持つ HTML 断片 | `fragment.html` を `overlays[]` から合成。断片ルートに時刻を置かず、素材本来の長さは `data-akari-natural-duration`（秒）に記録 | `telop` / `motion` |
 | `still` | 時間を持たない HTML シート | `fragment.html`。決定的スクショで画像に焼く | `thumbnail` |
 | `scene3d` | 3D モデル + 表示断片、またはベイクレシピ | `fragment.html` + glTF、または `scene.py` | `3d` |
 | `audio` | 音声トラックに載るバイナリ | `edit.json` の `audio.bgm` / `sfx` が参照 | `audio`（変更なし） |

package/vendor/docs/contract-2026-07-25-project-structure-v0.md

@@ -40,6 +40,7 @@ updated: 2026-09-06
 |---|---|---|
 | 人間の一次素材 | `assets/`（下位分類自由） | 人間・取り込み UI |
 | 企画・プラン | `planning/` | スキル + 人間承認 |
+| 仮枠のシーン JSON（AI が書く・人が微調整。仮枠の meta の `frame.content.scene` が指す） | `planning/frames/` | スキル・仮枠の編集 |
 | エージェント中間物・ad-hoc 検証スクリプトと結果 | `.akari/work/` | スキル・エージェント |
 | 検証証跡・レポート（キーフレーム視認 PNG・render-report 等） | `.akari/reports/` | スキル |
 | 絵コンテ（タイムラインの印刷・初回だけ・AI は後から読まない） | `.akari/reports/storyboard/` | スキル |
@@ -47,6 +48,8 @@ updated: 2026-09-06
 | 納品物 | `exports/` | `render-cut` |
 | 契約サイドカー（既存） | `.akari/`（`sidecars/` `diffs/` `events/` 等） | 既存のまま |
 
+`planning/frames/<stem>.scene.json` は仮枠（生成 v0 契約）の中身を記述する正本で、変更履歴に入る（`planning/**`）。仮枠の絵（png）と meta は従来どおり `assets/generated/`。
+
 `.akari/` 直下にはこの表にない契約サイドカーファイルも存在する（`intake.json`・
 `workflow.json`・`connections.json`・`lint.json`・`render.json` 等）。これらは各自の
 契約文書が正本であり、本契約は「置き場所の層」を追加で確定させるだけで、個々のファイル形は

package/vendor/docs/contract-2026-08-30-edit-json-v2-object-tree-v0.md

@@ -334,3 +334,7 @@ await p.save();                         // 正規直列化 → lint ゲート
 - 観察・手術の CLI コマンド（作らない。§5.2-5）
 - 種類ごとに違うグループ（sequence / scene 等）— 「段」と「グループ」の 2 つだけ
 - 文字ごとのキーフレーム（姉妹契約 §8）
+
+## 音声片のカット端
+
+edit.json v2 の audio lane にある分離済み speech item は、カットで素材端が失われたとき、任意の `cut_edge: { "in": 秒, "out": 秒, "at": 整数フレーム }` を持てる。`in` と `out` はこの音声片自身の元の素材端であり、頭がまたぎで削られた場合だけ `in` が現在の `source.in` と異なり、尻がまたぎで削られた場合だけ `out` が現在の `source.out` と異なる。両端が現在の素材端と等しくなれば欄を消す。`at` は「頭を `cut_edge.in` まで戻したときの開始フレーム」で、現在の `at - round((source.in - cut_edge.in) / 1 フレームぶんの素材秒)` から求める派生値である。カットで音声片を割ったときはそれぞれの片の端だけを保持し、結合時は左片の `in` と右片の `out` を採る。`in` と `out` は 0 以上の有限数で `in < out`、`at` は整数。先行カットのリップルを反映した途中状態では `cut_edge.at` が負になることもある。再生範囲の `source.in/out` と現在位置の `at` はそのまま正本とする。`provenance` はナレーションの生成元専用で、この用途には使わない。欄のない既存 item の意味は変わらない。

package/vendor/packages/akari-ear/README.md

@@ -0,0 +1,9 @@
+# AKARI バイブの耳
+
+耳はマイクを開き、音声を文字にして辞書を適用する共有部品です。判断サービスの資格や鍵に依存せず、マイクの持ち主を 1 つにします。
+
+段階 A では、試し聞きとメモ、区画の「いま」が耳を使います。Jev は従来どおり自分のマイクを使い、同時利用は禁止します。Jev 動作中は耳を使用中として扱います。
+
+段階 B では、Jev の聞き取りも耳へ統一します。発話と音量を係の `/say` と `/level` へ渡し、マイクの持ち主を耳に一本化します。
+
+現時点は骨組みのみで、実装は今後行います。

package/vendor/packages/akari-ear/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "@akari-video/akari-ear",
+  "version": "0.0.0",
+  "private": true,
+  "description": "AKARI バイブの耳（マイク → 文字起こし → 辞書）の共有部品。依存ゼロ。",
+  "type": "module",
+  "main": "src/index.mjs",
+  "scripts": {
+    "test": "node --test \"test/*.test.mjs\""
+  }
+}

package/vendor/packages/akari-launcher/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akari-video",
-  "version": "1.1.1",
+  "version": "1.2.0-beta.1",
   "description": "AKARI Video launcher CLI — start an AI-edited video project from any directory: scaffold, connection check, then hand over to Claude Code (or opencode). AKARI Video を opencode や Claude Code で、どのディレクトリからでも始めるための `akari` ランチャー CLI。接続確認（doctor）→ 未セットアップならプロジェクト雛形を作成 → AI エージェントを起動する。外部 npm 依存ゼロ（Node.js 組み込みモジュールのみ）。 [akari-video npm vendor: bin/akari.mjs is reference-only. These CLI entrypoints are not included in the akari-video npm package. Use `akari doctor --json` and run the path reported in `render_cut.path`. Full installations provide it in a monorepo checkout, ~/.akari/app, /Applications/AKARI Video.app/Contents/Resources/packages, or %LOCALAPPDATA%\\Programs\\@akari-videoshell\\resources\\packages.]",
   "type": "module",
   "files": [

package/vendor/packages/akari-vibe/README.md

@@ -1,7 +1,7 @@
 # AKARI バイブ
 
-このディレクトリは内部リポジトリの正本から自動生成する配布物です。直接編集しないでください。
-変更は内部へ戻し、検査を通して書き出し直します。版はシェルと一緒に管理します。
+このディレクトリは公開リポジトリが正本です。変更は通常のプルリクエスト・コミットで行います。
+版はシェルと一緒に管理します。
 判断は `https://akari.video/api/vibe` のサービスで行い、その実装は同梱しません。
 
 ## 起動

package/vendor/packages/asset-resolver/src/catalog.mjs

@@ -2,7 +2,7 @@
 // ~/.akari/catalog-cache.json へ自動キャッシュ（オフライン時のフォールバック）。
 // ローカルパス指定（開発・テスト）はファイルをそのまま読む。
 
-import { readFile, mkdir, writeFile } from 'node:fs/promises';
+import { readFile, mkdir, writeFile, stat } from 'node:fs/promises';
 import { catalogCachePath, resolveAkariHome, resolveCatalogSource } from './env.mjs';
 import { join } from 'node:path';
 import { loadInstalledItems, mergeInstalledItems } from './installed.mjs';
@@ -16,9 +16,26 @@ function normalizeCatalog(catalog) {
   return catalog;
 }
 
+// The local catalog is large; keep the parsed value until the file changes.
+const parsedCatalogs = new Map();
+async function readLocalCatalog(file, visible = false) {
+  const info = await stat(file);
+  const cached = parsedCatalogs.get(file);
+  if (cached && cached.mtimeMs === info.mtimeMs && cached.ctimeMs === info.ctimeMs
+      && cached.size === info.size) {
+    if (visible && !cached.public) cached.public = publicCatalog(cached.catalog);
+    return visible ? cached.public : cached.catalog;
+  }
+  const catalog = normalizeCatalog(JSON.parse(await readFile(file, 'utf8')));
+  const entry = { mtimeMs: info.mtimeMs, ctimeMs: info.ctimeMs, size: info.size, catalog,
+    ...(visible ? { public: publicCatalog(catalog) } : {}) };
+  parsedCatalogs.set(file, entry);
+  return visible ? entry.public : catalog;
+}
+
 export async function readCatalogCache(env = process.env) {
   try {
-    return publicCatalog(normalizeCatalog(JSON.parse(await readFile(catalogCachePath(env), 'utf8'))));
+    return await readLocalCatalog(catalogCachePath(env), true);
   } catch {
     return null;
   }
@@ -53,6 +70,7 @@ export async function cacheCatalog(env = process.env, catalog) {
   const home = resolveAkariHome(env);
   await mkdir(home, { recursive: true });
   await writeFile(catalogCachePath(env), `${JSON.stringify(publicCatalog(normalizeCatalog(catalog)), null, 2)}\n`);
+  parsedCatalogs.delete(catalogCachePath(env));
 }
 
 /**
@@ -70,8 +88,7 @@ export async function loadCatalog({ env = process.env, fetchImpl = fetch, includ
   }
 
   if (source.kind === 'file') {
-    const raw = await readFile(source.value, 'utf8');
-    catalog = normalizeCatalog(JSON.parse(raw));
+    catalog = await readLocalCatalog(source.value);
   } else {
     try {
       const { response: res, controller } = await fetchTimed(source.value, { fetchImpl, timeouts, label: 'カタログ' });

package/vendor/packages/asset-resolver/src/project-references.mjs

@@ -157,8 +157,13 @@ export async function readProjectReferences(projectDir) {
 
 export async function recordProjectReference(projectDir, reference) {
   assertReference(reference);
+  const alreadyRecorded = references => references.some(entry =>
+    entry.id === reference.id && entry.category === reference.category);
+  const current = await readProjectReferences(projectDir);
+  if (alreadyRecorded(current)) return current;
   return withReferencesLock(projectDir, async () => {
     const references = await readProjectReferences(projectDir);
+    if (alreadyRecorded(references)) return references;
     references.push({ id: reference.id, category: reference.category });
     const normalized = normalizeReferences(references);
     await writeProjectReferences(projectDir, normalized);

package/vendor/packages/asset-resolver/src/resolve.mjs

@@ -12,7 +12,7 @@ import { resolveAssetLibraryRoots } from '../../creator-root/src/index.mjs';
 
 import { spawn } from 'node:child_process';
 import { constants } from 'node:fs';
-import { cp, mkdir, mkdtemp, readFile, rename, rm, realpath, stat, writeFile } from 'node:fs/promises';
+import { cp, lstat, mkdir, mkdtemp, readFile, readdir, rename, rm, realpath, stat, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { format } from 'node:util';
@@ -94,6 +94,52 @@ async function validateAsset(assetDir) {
 
 export { AssetResolverError };
 
+// overlay-runtime は resolver の依存にしない。断片ルートの変換規則は両方を同じテストで固定する。
+export function withoutFragmentRootTiming(source, { preserveNaturalDuration = false } = {}) {
+  let cursor = 0;
+  while (cursor < source.length) {
+    const start = source.indexOf('<', cursor);
+    if (start < 0) break;
+    if (source.startsWith('<!--', start)) {
+      const end = source.indexOf('-->', start + 4);
+      if (end < 0) throw new Error('HTML コメントが閉じていません');
+      cursor = end + 3;
+      continue;
+    }
+    const tag = /^<([A-Za-z][\w:-]*)(?:"[^"]*"|'[^']*'|[^'">])*>/u.exec(source.slice(start));
+    if (!tag) { cursor = start + 1; continue; }
+    if (/^(?:style|script)$/iu.test(tag[1])) {
+      const closing = new RegExp(`</${tag[1]}\\s*>`, 'iu').exec(source.slice(start + tag[0].length));
+      if (!closing) throw new Error('HTML の前置要素が閉じていません');
+      cursor = start + tag[0].length + closing.index + closing[0].length;
+      continue;
+    }
+    if (/^link$/iu.test(tag[1])) { cursor = start + tag[0].length; continue; }
+    const nameEnd = tag[1].length + 1;
+    const attributes = tag[0].slice(nameEnd, -1);
+    const tokens = /([^\s=/>]+)(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s>]+))?/gu;
+    const removals = [];
+    let duration = null;
+    let hasNaturalDuration = false;
+    for (const token of attributes.matchAll(tokens)) {
+      if (preserveNaturalDuration && /^data-akari-natural-duration$/iu.test(token[1])) hasNaturalDuration = true;
+      if (!/^data-(?:start|duration)$/iu.test(token[1])) continue;
+      if (preserveNaturalDuration && /^data-duration$/iu.test(token[1])) {
+        const value = token[0].match(/=\s*(?:"([^"]*)"|'([^']*)'|([^\s>]+))/u)?.slice(1).find(part => part !== undefined);
+        if (value !== undefined && Number.isFinite(Number(value)) && Number(value) > 0) duration = value;
+      }
+      let from = token.index;
+      while (from > 0 && /\s/u.test(attributes[from - 1])) from--;
+      removals.push([from, token.index + token[0].length]);
+    }
+    let changed = attributes;
+    for (const [from, to] of removals.reverse()) changed = changed.slice(0, from) + changed.slice(to);
+    if (preserveNaturalDuration && !hasNaturalDuration && duration !== null) changed += ` data-akari-natural-duration="${duration}"`;
+    return source.slice(0, start + nameEnd) + changed + source.slice(start + tag[0].length - 1);
+  }
+  throw new Error('HTML 断片のルート要素がありません');
+}
+
 /** category/id を優先し、bare id はカタログ内で一意な場合だけ解決する。 */
 export function findCatalogItem(catalog, ref) {
   if (typeof ref === 'string' && ref.includes('/')) {
@@ -132,6 +178,12 @@ export async function copyIntoProject(sourceDir, projectDir, category, id) {
       child.on('close', code => resolveResult(code === 0));
     });
     if (cloned) {
+      try {
+        await normalizeCopiedFragments(dest, category);
+      } catch (error) {
+        await rm(dest, { recursive: true, force: true });
+        throw error;
+      }
       return dest;
     }
     // クロスボリューム等で -c が失敗したケース。部分的に書かれた dest を掃除してから
@@ -142,9 +194,41 @@ export async function copyIntoProject(sourceDir, projectDir, category, id) {
   // COPYFILE_FICLONE（_FORCE ではない）: 対応 FS（APFS 等）では CoW クローンで実体化コピーを
   // 省略し、非対応環境では黙って通常コピーへフォールバックする（失敗しない）。
   await cp(realSourceDir, dest, { recursive: true, mode: constants.COPYFILE_FICLONE });
+  try {
+    await normalizeCopiedFragments(dest, category);
+  } catch (error) {
+    await rm(dest, { recursive: true, force: true });
+    throw error;
+  }
   return dest;
 }
 
+async function normalizeCopiedFragments(dest, category) {
+  if (category !== 'overlay' && category !== 'scene3d') return;
+  const files = ['fragment.html'];
+  const variants = path.join(dest, 'variants');
+  const variantInfo = await lstat(variants).catch(error => {
+    if (error.code === 'ENOENT') return null;
+    throw error;
+  });
+  if (variantInfo && !variantInfo.isDirectory()) throw new Error('variants が通常のディレクトリではありません');
+  for (const entry of variantInfo ? await readdir(variants) : []) {
+    if (entry.endsWith('.html')) files.push(path.join('variants', entry));
+  }
+  for (const file of files) {
+    const target = path.join(dest, file);
+    const info = await lstat(target).catch(error => {
+      if (error.code === 'ENOENT') return null;
+      throw error;
+    });
+    if (info === null) continue;
+    if (!info.isFile()) throw new Error(`断片ファイルが通常のファイルではありません: ${file}`);
+    const source = await readFile(target, 'utf8');
+    const cleaned = withoutFragmentRootTiming(source, { preserveNaturalDuration: true });
+    if (cleaned !== source) await writeFile(target, cleaned);
+  }
+}
+
 async function moveIntoLibrary(tempDir, destDir) {
   await mkdir(path.dirname(destDir), { recursive: true });
   if (await stat(destDir).then(() => true, error => { if (error.code === 'ENOENT') return false; throw error; })) {
@@ -282,6 +366,24 @@ export async function resolve(
   { env = process.env, fetchImpl = fetch, project = null, force = false, reference = false, timeouts } = {},
 ) {
   const home = resolveAssetLibraryRoots(env).write;
+  // A qualified reference already names the local directory. Avoid parsing the
+  // large catalog on the common placement path; uncached and bare IDs still use it.
+  const localRef = typeof ref === 'string' ? ref.split('/') : [];
+  const qualified = localRef.length === 2 && localRef.every(part => part.length > 0
+    && part !== '.' && part !== '..' && !/[\\\0]/.test(part));
+  if (!force && qualified) {
+    const cachedDir = await cachedAssetDirAsync(env, localRef[0], localRef[1]);
+    if (cachedDir) {
+      const result = { id: localRef[1], category: localRef[0], dir: cachedDir, cached: true };
+      if (project && reference) {
+        await recordProjectReference(project, { id: localRef[1], category: localRef[0] });
+        result.referenced = true;
+      } else if (project) {
+        result.projectDir = await copyIntoProject(cachedDir, project, localRef[0], localRef[1]);
+      }
+      return result;
+    }
+  }
   const catalog = await loadCatalogForResolveAsync(ref, { env, fetchImpl, timeouts });
   const item = findCatalogItem(catalog, ref);
 

package/vendor/packages/asset-resolver/src/state.mjs

@@ -82,7 +82,7 @@ export async function composeState({ env = process.env, fetchImpl = fetch, inten
     localItems.delete(key);
     // Preserve remote download descriptors/preview keys for existing consumers.
     // Local-only assets use the actual directory listing assembled above.
-    return local ? { ...item, ...local, tier: item.tier ?? assetTier(item), files: item.files ?? local.files, preview: item.preview ?? local.preview,
+    return local ? { ...item, ...local, tier: item.tier ?? assetTier(item), files: item.files ?? local.files, preview: local.libraryDir && local.preview ? local.preview : item.preview ?? local.preview,
       ...(item.source === 'installed' ? { source: item.source } : {}) } : item;
   });
   const localOnlyKeys = new Set(localItems.keys());

package/vendor/packages/asset-resolver/test/catalog-and-state.test.mjs

@@ -1,5 +1,5 @@
 import assert from 'node:assert/strict';
-import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { mkdirSync, readFileSync, utimesSync, writeFileSync } from 'node:fs';
 import path from 'node:path';
 import test from 'node:test';
 import { cacheCatalog, loadCatalog, readCatalogCache } from '../src/catalog.mjs';
@@ -13,6 +13,18 @@ test('loadCatalog はローカルパス指定のカタログを読める', async
   assert.equal(loaded.items.length, catalog.items.length);
 });
 
+test('ローカルカタログは mtime が同じ間は解析結果を再利用し、更新後に読み直す', async () => {
+  const { env, catalog, catalogPath } = setupFixtureEnv();
+  const first = await loadCatalog({ env, includeInstalled: false });
+  assert.equal(await loadCatalog({ env, includeInstalled: false }), first);
+  writeFileSync(catalogPath, JSON.stringify({ ...catalog, items: [...catalog.items, { id: 'new', category: 'still' }] }));
+  const updated = new Date(Date.now() + 5000);
+  utimesSync(catalogPath, updated, updated);
+  const next = await loadCatalog({ env, includeInstalled: false });
+  assert.notEqual(next, first);
+  assert.equal(next.items.at(-1).id, 'new');
+});
+
 test('catalog cache drops files for locked and Pro items before writing and on old-cache reads', async () => {
   const { env, home, catalog } = setupFixtureEnv();
   catalog.items[0].tier = 'free';
@@ -88,6 +100,19 @@ test('composeState: ローカルに実体があるものは cached になる', a
   assert.equal(free.state, 'cached');
 });
 
+test('composeState: cached preview uses local filename over catalog key', async () => {
+  const { env, home, catalog, catalogPath } = setupFixtureEnv();
+  catalog.items[0].preview = 'still/mini-still/v1/preview.png';
+  writeFileSync(catalogPath, JSON.stringify(catalog));
+  const dir = path.join(home, 'assets', 'still', 'mini-still');
+  mkdirSync(dir, { recursive: true });
+  writeFileSync(path.join(dir, 'preview.png'), 'local preview');
+  const item = (await composeState({ env })).items.find(entry => entry.id === 'mini-still');
+  assert.equal(item.state, 'cached');
+  assert.equal(item.preview, 'preview.png');
+  assert.equal(item.libraryDir, dir);
+});
+
 test('composeState: legacy local-only metadata without tier displays free while catalog stays fail-closed', async () => {
   const { env, home, catalog, catalogPath } = setupFixtureEnv();
   const dir = path.join(home, 'assets', 'audio', 'old-local');

package/vendor/packages/asset-resolver/test/fixtures/fragment-root-timing.json

@@ -0,0 +1,35 @@
+{
+  "version": 1,
+  "cases": [
+    {
+      "name": "comment and child timing",
+      "source": "<!-- data-duration=\"90\" -->\n<div data-start=\"0\" data-duration=\"8\"><span data-duration=\"2\">text</span></div>",
+      "plain": "<!-- data-duration=\"90\" -->\n<div><span data-duration=\"2\">text</span></div>",
+      "preserved": "<!-- data-duration=\"90\" -->\n<div data-akari-natural-duration=\"8\"><span data-duration=\"2\">text</span></div>"
+    },
+    {
+      "name": "leading style and existing natural duration",
+      "source": "<style>.x{color:red}</style><div data-start=0 data-duration=6 data-akari-natural-duration=\"9\">text</div>",
+      "plain": "<style>.x{color:red}</style><div data-akari-natural-duration=\"9\">text</div>",
+      "preserved": "<style>.x{color:red}</style><div data-akari-natural-duration=\"9\">text</div>"
+    },
+    {
+      "name": "duration before class",
+      "source": "<div data-start=\"0\" data-duration=\"4\" class=\"x\">text</div>",
+      "plain": "<div class=\"x\">text</div>",
+      "preserved": "<div class=\"x\" data-akari-natural-duration=\"4\">text</div>"
+    },
+    {
+      "name": "start only with child duration",
+      "source": "<div data-start=\"3\"><span data-duration=\"2\">text</span></div>",
+      "plain": "<div><span data-duration=\"2\">text</span></div>",
+      "preserved": "<div><span data-duration=\"2\">text</span></div>"
+    },
+    {
+      "name": "single quoted duration",
+      "source": "<div data-duration='2.5' data-start='0'>text</div>",
+      "plain": "<div>text</div>",
+      "preserved": "<div data-akari-natural-duration=\"2.5\">text</div>"
+    }
+  ]
+}

package/vendor/packages/asset-resolver/test/fragment-project-copy.test.mjs

@@ -0,0 +1,45 @@
+import assert from 'node:assert/strict';
+import { mkdtemp, mkdir, readFile, readdir, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+import test from 'node:test';
+import { copyIntoProject, withoutFragmentRootTiming as resolverTiming } from '../src/resolve.mjs';
+
+const rootTag = html => html.match(/<div\b[^>]*>/)?.[0] ?? '';
+const { version, cases } = JSON.parse(await readFile(new URL('./fixtures/fragment-root-timing.json', import.meta.url), 'utf8'));
+
+test('resolver は通常・素材コピーの両モードで共通の入出力表に従う', () => {
+  assert.equal(version, 1);
+  for (const { name, source, plain, preserved } of cases) {
+    for (const [options, expected] of [[undefined, plain], [{ preserveNaturalDuration: true }, preserved]]) {
+      const actual = resolverTiming(source, options);
+      assert.equal(actual, expected, name);
+      assert.doesNotMatch(rootTag(actual), /\bdata-(?:start|duration)\s*=/);
+    }
+  }
+});
+
+for (const category of ['overlay', 'scene3d']) {
+  test(`copyIntoProject は ${category} の fragment と variants だけを正規化する`, async t => {
+    const root = await mkdtemp(path.join(tmpdir(), 'fragment-project-copy-'));
+    t.after(() => rm(root, { recursive: true, force: true }));
+    const source = path.join(root, 'source');
+    const project = path.join(root, 'project');
+    await mkdir(path.join(source, 'variants'), { recursive: true });
+    await mkdir(project);
+    await writeFile(path.join(source, 'fragment.html'), cases[0].source);
+    await writeFile(path.join(source, 'variants', 'alternate.html'), cases[2].source);
+    await writeFile(path.join(source, 'variants', 'note.txt'), 'data-start="0"');
+    await writeFile(path.join(source, 'meta.json'), '{"id":"board"}\n');
+
+    const dest = await copyIntoProject(source, project, category, 'board');
+    for (const name of ['fragment.html', 'variants/alternate.html']) {
+      const actual = await readFile(path.join(dest, name), 'utf8');
+      assert.doesNotMatch(rootTag(actual), /\bdata-(?:start|duration)\s*=/);
+      assert.match(rootTag(actual), /data-akari-natural-duration=/);
+    }
+    assert.equal(await readFile(path.join(source, 'fragment.html'), 'utf8'), cases[0].source);
+    assert.equal(await readFile(path.join(dest, 'variants/note.txt'), 'utf8'), 'data-start="0"');
+    assert.deepEqual((await readdir(dest)).sort(), ['fragment.html', 'meta.json', 'variants']);
+  });
+}

package/vendor/packages/asset-resolver/test/project-references.test.mjs

@@ -1,6 +1,6 @@
 import assert from 'node:assert/strict';
 import { existsSync, realpathSync } from 'node:fs';
-import { mkdir, readFile, readdir, rm, writeFile } from 'node:fs/promises';
+import { mkdir, readFile, readdir, rm, stat, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import test from 'node:test';
 
@@ -26,6 +26,11 @@ test('project references: tolerant read, idempotent upsert, stable sort, and rem
 
   await recordProjectReference(project, { id: 'zeta', category: 'still' });
   await recordProjectReference(project, { id: 'alpha', category: 'still' });
+  const unchanged = await stat(ledger);
+  await recordProjectReference(project, { id: 'alpha', category: 'still' });
+  const repeated = await stat(ledger);
+  assert.equal(repeated.mtimeMs, unchanged.mtimeMs);
+  assert.equal(repeated.ino, unchanged.ino);
   await recordProjectReference(project, { id: 'theme', category: 'audio' });
   await recordProjectReference(project, { id: 'alpha', category: 'still' });
   assert.deepEqual(await readProjectReferences(project), [

package/vendor/packages/asset-resolver/test/resolve-fast.test.mjs

@@ -32,6 +32,18 @@ test('取得済み id はカタログもファイルも通信しない', async (
   assert.equal(calls, 0);
 });
 
+test('category/id の手元素材はカタログファイルが無くても配置できる', async () => {
+  const { env, item } = fixture();
+  env.AKARI_ASSETS_CATALOG = '/missing-catalog.json';
+  const dir = localAssetDir(env, item.category, item.id);
+  mkdirSync(dir, { recursive: true });
+  writeFileSync(path.join(dir, 'part-0.bin'), 'ready');
+  const result = await resolve(`${item.category}/${item.id}`, { env,
+    fetchImpl: async () => { throw Error('catalog was fetched'); } });
+  assert.equal(result.cached, true);
+  assert.equal(result.dir, dir);
+});
+
 test('控えに id があれば未取得でもファイルだけ取得する', async () => {
   const { env, item, catalog } = fixture();
   await cacheCatalog(env, catalog);

package/vendor/packages/edit-lint/src/engine-capabilities.json

@@ -5,6 +5,7 @@
   "fields": [
     { "path": "tracks[].items[].audio", "applies_to": ["cuts"], "gpu": "consumed", "osr": "consumed", "evidence": "packages/render-cut/src/internal-render.mjs projectRendererCompatibilityEdit; packages/render-cut/src/plan.mjs cut_audio uses isCutAudioAudible before GPU/OSR audioSourcePath mux" },
     { "path": "tracks[].items[].link", "applies_to": ["audio"], "gpu": "ignored", "osr": "ignored", "evidence": "Editing association only. Engines use the audio item source and timing; link is not consumed." },
+    { "path": "tracks[].items[].cut_edge", "applies_to": ["audio"], "gpu": "ignored", "osr": "ignored", "evidence": "Editing-only restore record of the pre-cut audio edge; engines use the item source and timing." },
     { "path": "tracks[].items[].mute", "applies_to": ["audio"], "gpu": "other-subsystem", "osr": "other-subsystem", "consumer": "render-cut audio mix", "evidence": "packages/edit-store/src/audio-ownership.ts isAudioItemAudible; packages/render-cut/src/internal-render.mjs and plan.mjs audio mix" },
     { "path": "tracks[].items[].id", "applies_to": ["cuts", "layers", "overlays", "baked", "captions", "group"], "gpu": "consumed", "osr": "consumed", "evidence": "packages/edit-store/src/internal-model.ts buildV2VisualItem; packages/frame-engine/src/timeline/plan.ts layerFromPlacement/resolvedCompositeLayers; packages/render-cut/src/internal-render.mjs captionItemOverlays/renderItemDeclaration" },
     { "path": "tracks[].items[].id", "applies_to": ["audio"], "gpu": "other-subsystem", "osr": "other-subsystem", "consumer": "render-cut audio mix", "evidence": "packages/edit-store/src/internal-model.ts buildV2AudioItem" },

package/vendor/packages/edit-lint/src/lint/captions.mjs

@@ -270,6 +270,15 @@ export function validateCaptions(captions, edit, analysis, findings, paths, cuts
     if (Object.hasOwn(caption, "words")) {
       validateCaptionWords(caption.words, caption, findings, itemPath);
     }
+    if ((caption.style === "karaoke" || caption.style === "pop")
+      && (!Array.isArray(caption.words) || caption.words.length === 0)) {
+      addFinding(findings, {
+        severity: "warning",
+        check: `captions.${caption.style}-without-words`,
+        message: `字幕 ${caption.id ?? "(unknown)"}: 語の時刻がない字幕は${caption.style === "karaoke" ? "カラオケ" : "ポップ"}で表示できません。通常の表示で書き出します`,
+        path: itemPath,
+      });
+    }
     if (Object.hasOwn(caption, "unrecognized")) {
       validateCaptionUnrecognized(caption.unrecognized, caption, findings, itemPath);
     }

package/vendor/packages/edit-lint/src/lint/edit-v2.mjs

@@ -432,6 +432,19 @@ export function validateEditV2(edit, findings) {
 
       if (track.lane === "audio") {
         const role = item.role ?? "sfx";
+        if (Object.hasOwn(item, "cut_edge")) {
+          const edge = item.cut_edge;
+          if (!isRecord(edge) || !isFiniteNumber(edge.in) || edge.in < 0
+            || !isFiniteNumber(edge.out) || edge.out <= edge.in
+            || !Number.isInteger(edge.at)
+            || Object.keys(edge).some(key => !["in", "out", "at"].includes(key))) {
+            addFinding(findings, {
+              severity: "error", check: "v2.audio-cut-edge",
+              message: "cut_edge requires non-negative in < out (seconds) and at (integer frames)",
+              path: `${itemPath}.cut_edge`,
+            });
+          }
+        }
         if (Object.hasOwn(item, "gain_db")
           && (!isFiniteNumber(item.gain_db) || item.gain_db < -60 || item.gain_db > 12)) {
           addFinding(findings, {