akari-video 0.1.55 → 0.1.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akari-video",
-  "version": "0.1.55",
+  "version": "0.1.56",
   "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/vendor/packages/akari-launcher/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akari-video",
-  "version": "0.1.55",
+  "version": "0.1.56",
   "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/edit-lint/src/edit-lint.mjs

@@ -308,16 +308,19 @@ export async function lintProject(input, options = {}) {
     paths,
     structure.sourceIds,
   );
-  // 総尺は edit-store の共通定義で決める。映像本体がある間は従来の visual 最大終端のままで、
-  // 0 秒のときだけ overlays / 音声の終端へ後退する。cuts が構造的に不正なときは従来どおり
-  // timeline を null にして下流の尺検証を止める。
+  // 全素材の最大終端を出力尺とする。外部字幕の output 区間も同じ出力軸へ加える。
+  // cuts が構造的に不正なら下流の尺検証は止める。
   const timelineDuration = cutsStructureResult === null ? null : timelineDurationSeconds(internalEdit);
-  const timeline = timelineDuration?.seconds ?? null;
+  const captionRows = Array.isArray(captionsState.value) ? captionsState.value
+    : Array.isArray(captionsState.value?.captions) ? captionsState.value.captions : [];
+  const outputCaptionEnd = captionRows.reduce((end, cue) =>
+    cue?.time_domain === 'output' && Number.isFinite(cue.end) ? Math.max(end, cue.end) : end, 0);
+  const timeline = timelineDuration ? Math.max(timelineDuration.seconds, outputCaptionEnd) : null;
   if (timelineDuration?.basis === "overlays-audio") {
     addFinding(findings, {
       severity: "info",
       check: "timeline.duration-derived",
-      message: `映像素材が無いため尺を overlays / 音声の終端 ${formatNumber(timeline)} 秒から導出した`,
+      message: `尺を overlays / 字幕 / 音声の終端 ${formatNumber(timeline)} 秒から導出した`,
       path: "edit.json#tracks",
     });
   }
@@ -326,16 +329,10 @@ export async function lintProject(input, options = {}) {
   validateStillImageCuts(edit, findings);
   const cutTrackSegments = computeCutTrackSegments(edit.cuts);
   validateTransitionAdjacency(edit.cuts, cutTrackSegments, edit.sources, edit.fps, findings);
-  for (const segment of findTrackOverlaps(cutTrackSegments)) {
-    if (isDeclaredTransitionOverlap(edit.cuts, cutTrackSegments, segment, edit.fps)) continue;
-    addFinding(findings, {
-      severity: "error",
-      check: "cuts.track-overlap",
-      message: `cut overlaps another cut on track ${segment.track} in the output axis`,
-      path: `edit.json#cuts[${segment.index}]`,
-      range: { start: segment.start, end: segment.end },
-    });
-  }
+  // v2.track-no-overlap above checks the actual track IDs before legacy projection.
+  // A mixed telop/media track may project its media into cuts with the same numeric
+  // ref as another physical track. Those per-kind aliases are not v2 track identity;
+  // checking projected cuts again would reject valid cross-track composition.
   validateDurationMaximum(edit.outputs, timeline, findings, paths);
   validateOutputAxisDurationMax(edit.outputs, cutTrackSegments, findings);
   await validateOverlays(edit.overlays, timeline, findings, paths);

package/vendor/packages/edit-store/lib/audio-schedule.js

@@ -175,6 +175,9 @@ function scheduleBgm(spec, timelineDurationSec, startAtSec, duckIntervals, warni
     const timelineT = typeof spec.t === 'number' && Number.isFinite(spec.t) && spec.t > 0 ? spec.t : 0;
     if (timelineT >= timelineDurationSec)
         return null;
+    const itemEndSec = finitePositive(spec.duration) ? Math.min(timelineDurationSec, timelineT + spec.duration) : timelineDurationSec;
+    if (startAtSec >= itemEndSec)
+        return null;
     const sidecar = validSidecar(spec.sidecar);
     if (spec.sidecar && !sidecar)
         warnings.push(`${label}: sidecar declaration is invalid; using source`);
@@ -196,7 +199,7 @@ function scheduleBgm(spec, timelineDurationSec, startAtSec, duckIntervals, warni
         return null;
     }
     const timelineStartSec = startAtSec + delaySec;
-    const timelineAvailableSec = timelineDurationSec - timelineStartSec;
+    const timelineAvailableSec = itemEndSec - timelineStartSec;
     const durationSec = Math.min(timelineAvailableSec, loop ? timelineAvailableSec : (materialDurationSec - sourceOffsetSec) / playbackRate);
     if (!(durationSec > 0))
         return null;
@@ -214,8 +217,8 @@ function scheduleBgm(spec, timelineDurationSec, startAtSec, duckIntervals, warni
         sourceDurationSec: durationSec * playbackRate,
         loop,
         gainDb,
-        gainEvents: bgmFadeGainEvents(spec.fadeIn, spec.fadeOut, timelineDurationSec, timelineStartSec, durationSec, baseGain),
-        envelopeEvents: scheduledEnvelopeEvents(spec, timelineT, timelineDurationSec - timelineT, elapsedSec, durationSec, duckIntervals)
+        gainEvents: bgmFadeGainEvents(spec.fadeIn, spec.fadeOut, itemEndSec, timelineStartSec, durationSec, baseGain),
+        envelopeEvents: scheduledEnvelopeEvents(spec, timelineT, itemEndSec - timelineT, elapsedSec, durationSec, duckIntervals)
     };
 }
 function scheduleSpeech(spec, timelineDurationSec, startAtSec, warnings) {

package/vendor/packages/edit-store/lib/edit-store.d.ts

@@ -42,6 +42,8 @@ export interface EditOverlay {
 }
 export type LayerBlendMode = 'normal' | 'screen' | 'multiply' | 'add' | 'difference' | 'darken' | 'lighten' | 'overlay' | 'hardlight' | 'softlight';
 export interface EditLayer {
+    in?: number;
+    speed?: number;
     id: string;
     t: number;
     duration: number;
@@ -132,6 +134,8 @@ export interface CutTrackSegment {
     end: number;
 }
 export interface EditAudioBgm {
+    t?: number;
+    duration?: number;
     id: 'bgm';
     path: string;
     track?: number;

package/vendor/packages/edit-store/lib/internal-model.d.ts

@@ -202,9 +202,8 @@ export declare function readInternalSources(source: string | unknown): InternalS
  */
 export declare function visualContentEndSeconds(internal: InternalEdit): number;
 /**
- * 出力タイムラインの総尺。映像本体がある間は visualContentEndSeconds を唯一の正本とし、
- * 映像本体が 0 秒のときだけ overlays / 字幕 / narration / sfx の最大終端へ後退する。
- * BGM は総尺に合わせて切られる素材なので、後退尺には含めない。
+ * 出力タイムラインの総尺は全素材の最大終端。映像の後ろの HTML・字幕・音声も出力対象。
+ * 実尺未解決（duration=0）の音源はここでは延長せず、再生・書き出し時のプローブで補完する。
  */
 export declare function timelineDurationSeconds(internal: InternalEdit): {
     seconds: number;

package/vendor/packages/edit-store/lib/internal-model.js

@@ -77,21 +77,17 @@ function visualContentEndSeconds(internal) {
     return maxEnd;
 }
 /**
- * 出力タイムラインの総尺。映像本体がある間は visualContentEndSeconds を唯一の正本とし、
- * 映像本体が 0 秒のときだけ overlays / 字幕 / narration / sfx の最大終端へ後退する。
- * BGM は総尺に合わせて切られる素材なので、後退尺には含めない。
+ * 出力タイムラインの総尺は全素材の最大終端。映像の後ろの HTML・字幕・音声も出力対象。
+ * 実尺未解決（duration=0）の音源はここでは延長せず、再生・書き出し時のプローブで補完する。
  */
 function timelineDurationSeconds(internal) {
     const visualEnd = visualContentEndSeconds(internal);
-    if (visualEnd > 0) {
-        return { seconds: visualEnd, basis: 'visual' };
-    }
     let fallbackEnd = 0;
     const walk = (item, lane) => {
         const isFallbackVisual = lane === 'visual'
             && ['html', 'group', 'captions', 'caption'].includes(item.source.kind);
         const isFallbackAudio = lane === 'audio'
-            && (item.legacy.collection === 'narration' || item.legacy.collection === 'sfx');
+            && item.duration > 0;
         if (isFallbackVisual || isFallbackAudio) {
             fallbackEnd = Math.max(fallbackEnd, item.at + item.duration);
         }
@@ -102,6 +98,8 @@ function timelineDurationSeconds(internal) {
         for (const item of track.items)
             walk(item, track.lane);
     }
+    if (visualEnd >= fallbackEnd && visualEnd > 0)
+        return { seconds: visualEnd, basis: 'visual' };
     return fallbackEnd > 0
         ? { seconds: fallbackEnd, basis: 'overlays-audio' }
         : { seconds: 0, basis: 'empty' };
@@ -655,6 +653,7 @@ function buildV2VisualItem(item, fps, ref, pathOf, chromaKeyOf, legacyIndexCount
             if (needsLayersEngine(item, chromaKeyOf, hasOverlappingSibling)) {
                 const declaration = {
                     id: item.id, t: at, duration, kind: 'video', src: path ?? item.source.src,
+                    in: item.source.in,
                     track: ref, ...common, ...copyMediaSourceFields(item.source),
                     ...('audio' in item && item.audio === false ? { audio: false } : {})
                 };
@@ -892,6 +891,7 @@ function buildV2AudioItem(item, fps, ref, pathOf, legacyIndexCounters) {
     if (role === 'bgm') {
         const value = {
             id: 'bgm',
+            ...(duration > 0 ? { t: at, duration } : {}),
             path: resolvedPath,
             track: ref,
             ...(item.fade_in !== undefined ? { fadeIn: item.fade_in } : {}),
@@ -910,6 +910,7 @@ function buildV2AudioItem(item, fps, ref, pathOf, legacyIndexCounters) {
                 id: item.id, atFrames, durationFrames, at, duration, children: [], source,
                 declaration: {
                     path: resolvedPath,
+                    ...(duration > 0 ? { t: at, duration } : {}),
                     ...(item.source.in !== undefined ? { in: item.source.in } : {}),
                     ...(item.fade_in !== undefined ? { fadeIn: item.fade_in } : {}),
                     ...(item.fade_out !== undefined ? { fadeOut: item.fade_out } : {}),

package/vendor/packages/edit-store/lib/migrate/index.js

@@ -43,7 +43,7 @@ const CUT_KEYS = new Set([
 ]);
 const OVERLAY_KEYS = new Set(['id', 'html', 'start', 'duration', 'vars', 'transform', 'track']);
 const LAYER_KEYS = new Set([
-    'id', 't', 'duration', 'kind', 'src', 'transform', 'crop', 'perspective', 'opacity',
+    'id', 't', 'duration', 'kind', 'src', 'in', 'speed', 'transform', 'crop', 'perspective', 'opacity',
     'keyframes', 'preset', 'params', 'track', 'blend', 'chroma_key', 'filter', 'mask'
 ]);
 const AUDIO_ENVELOPE_KEYS = ['keyframes', 'ducking', 'duck_db', 'duck_attack', 'duck_release'];
@@ -217,7 +217,7 @@ function migrateEditToV2(raw, options = {}) {
         let source;
         let mask;
         if (value.kind === 'filter') {
-            const forbidden = ['src', 'chroma_key', 'blend', 'crop', 'transform', 'mask'].filter(key => hasOwn(value, key));
+            const forbidden = ['src', 'in', 'speed', 'chroma_key', 'blend', 'crop', 'transform', 'mask'].filter(key => hasOwn(value, key));
             if (forbidden.length > 0) {
                 blockers.push(`edit.json.layers[${index}] の kind filter は ${forbidden.join(' / ')} を持てません。`);
                 return;
@@ -229,6 +229,10 @@ function migrateEditToV2(raw, options = {}) {
             return;
         }
         else if (value.kind === 'baked' && nonEmpty(value.preset)) {
+            if (hasOwn(value, 'in') || hasOwn(value, 'speed')) {
+                blockers.push(`edit.json.layers[${index}] の in / speed は baked telop へ変換できません。`);
+                return;
+            }
             if (hasOwn(value, 'mask')) {
                 blockers.push(`edit.json.layers[${index}].mask は baked telop へ変換できません。`);
                 return;
@@ -239,6 +243,13 @@ function migrateEditToV2(raw, options = {}) {
             };
         }
         else {
+            if ((hasOwn(value, 'in') && !nonNegative(value.in))
+                || (hasOwn(value, 'speed') && !positive(value.speed))) {
+                blockers.push(`edit.json.layers[${index}] の in / speed が不正です。`);
+                return;
+            }
+            const sourceIn = hasOwn(value, 'in') ? value.in : 0;
+            const speed = hasOwn(value, 'speed') ? value.speed : 1;
             let src = sourceIdByPath.get(value.src);
             if (!src) {
                 do
@@ -248,7 +259,10 @@ function migrateEditToV2(raw, options = {}) {
                 sourceIdByPath.set(value.src, src);
                 sources.push({ id: src, path: value.src, proxy: null });
             }
-            source = { kind: 'media', src, in: 0, out: value.duration, ...copyPresent(value, ['chroma_key']) };
+            source = {
+                kind: 'media', src, in: sourceIn, out: sourceIn + value.duration * speed,
+                ...copyPresent(value, ['speed', 'chroma_key'])
+            };
             if (hasOwn(value, 'mask')) {
                 if (!nonEmpty(value.mask)) {
                     blockers.push(`edit.json.layers[${index}].mask が不正です。`);

package/vendor/packages/edit-store/lib/webview-kernel.js

@@ -1319,6 +1319,8 @@ var AkariEditKernel = (() => {
     if (gainDb === null) return null;
     const timelineT = typeof spec.t === "number" && Number.isFinite(spec.t) && spec.t > 0 ? spec.t : 0;
     if (timelineT >= timelineDurationSec) return null;
+    const itemEndSec = finitePositive(spec.duration) ? Math.min(timelineDurationSec, timelineT + spec.duration) : timelineDurationSec;
+    if (startAtSec >= itemEndSec) return null;
     const sidecar = validSidecar(spec.sidecar);
     if (spec.sidecar && !sidecar) warnings.push(`${label}: sidecar declaration is invalid; using source`);
     const materialDurationSec = sidecar ? sidecar.durationSec : spec.durationSec;
@@ -1338,7 +1340,7 @@ var AkariEditKernel = (() => {
       return null;
     }
     const timelineStartSec = startAtSec + delaySec;
-    const timelineAvailableSec = timelineDurationSec - timelineStartSec;
+    const timelineAvailableSec = itemEndSec - timelineStartSec;
     const durationSec = Math.min(
       timelineAvailableSec,
       loop ? timelineAvailableSec : (materialDurationSec - sourceOffsetSec) / playbackRate
@@ -1361,7 +1363,7 @@ var AkariEditKernel = (() => {
       gainEvents: bgmFadeGainEvents(
         spec.fadeIn,
         spec.fadeOut,
-        timelineDurationSec,
+        itemEndSec,
         timelineStartSec,
         durationSec,
         baseGain
@@ -1369,7 +1371,7 @@ var AkariEditKernel = (() => {
       envelopeEvents: scheduledEnvelopeEvents(
         spec,
         timelineT,
-        timelineDurationSec - timelineT,
+        itemEndSec - timelineT,
         elapsedSec,
         durationSec,
         duckIntervals
@@ -2911,6 +2913,7 @@ var AkariEditKernel = (() => {
             duration,
             kind: "video",
             src: path ?? item.source.src,
+            in: item.source.in,
             track: ref,
             ...common,
             ...copyMediaSourceFields(item.source),
@@ -3233,6 +3236,7 @@ var AkariEditKernel = (() => {
     if (role === "bgm") {
       const value2 = {
         id: "bgm",
+        ...duration > 0 ? { t: at, duration } : {},
         path: resolvedPath,
         track: ref,
         ...item.fade_in !== void 0 ? { fadeIn: item.fade_in } : {},
@@ -3257,6 +3261,7 @@ var AkariEditKernel = (() => {
           source,
           declaration: {
             path: resolvedPath,
+            ...duration > 0 ? { t: at, duration } : {},
             ...item.source.in !== void 0 ? { in: item.source.in } : {},
             ...item.fade_in !== void 0 ? { fadeIn: item.fade_in } : {},
             ...item.fade_out !== void 0 ? { fadeOut: item.fade_out } : {},

package/vendor/packages/schemas/engine-capabilities.json

@@ -81,7 +81,7 @@
     { "path": "tracks[].items[].source.freeze", "applies_to": ["layers"], "gpu": "ignored", "osr": "ignored", "runtime_warning": true, "evidence": "packages/edit-store/src/internal-model.ts copyMediaSourceFields; packages/frame-engine/src/timeline/plan.ts KNOWN_LAYER_KEYS omits freeze" },
     { "path": "tracks[].items[].source.fx", "applies_to": ["cuts", "layers"], "gpu": "ignored", "osr": "ignored", "runtime_warning": true, "evidence": "packages/edit-store/src/internal-model.ts copyMediaSourceFields; packages/frame-engine/src/timeline/plan.ts KNOWN_CUT_KEYS/KNOWN_LAYER_KEYS omit fx", "hint": "GPU / OSR frame-engine には登録済み cut FX が無い" },
     { "path": "tracks[].items[].source.speed", "applies_to": ["cuts"], "gpu": "consumed", "osr": "consumed", "evidence": "packages/edit-store/src/internal-model.ts buildV2VisualItem speed projection; packages/frame-engine/src/timeline/plan.ts buildResolvedTimelinePlan/layerFromPlacement" },
-    { "path": "tracks[].items[].source.speed", "applies_to": ["layers"], "gpu": "ignored", "osr": "ignored", "runtime_warning": true, "evidence": "packages/edit-store/src/internal-model.ts copyMediaSourceFields; packages/frame-engine/src/timeline/plan.ts KNOWN_LAYER_KEYS omits speed" },
+    { "path": "tracks[].items[].source.speed", "applies_to": ["layers"], "gpu": "consumed", "osr": "consumed", "evidence": "packages/edit-store/src/internal-model.ts copyMediaSourceFields; packages/frame-engine/src/timeline/plan.ts resolvedCompositeLayers preserves source trim and speed" },
     { "path": "tracks[].items[].source.gain_db", "applies_to": ["cuts"], "gpu": "other-subsystem", "osr": "other-subsystem", "evidence": "packages/render-cut/src/plan.mjs cutSpeechVolumeSuffix (appendSequentialAudioCutFilters / gap-aware); packages/edit-store/src/audio-schedule.ts projectSpeechDeclarations speechGainDb", "note": "埋め込み音声（speech）の減衰。映像エンジンではなく render-cut の cut 音声（全エンジン共通）とプレビューの音声供給が消費する" },
     { "path": "tracks[].items[].source.mute", "applies_to": ["cuts"], "gpu": "other-subsystem", "osr": "other-subsystem", "evidence": "packages/render-cut/src/plan.mjs cut.mute -> anullsrc branch; packages/edit-store/src/audio-schedule.ts projectSpeechDeclarations skips muted cuts", "note": "埋め込み音声（speech）のミュート。尺は保ち無音区間になる" },
     { "path": "tracks[].items[].source.chroma_key", "applies_to": ["cuts", "layers"], "gpu": "partial", "osr": "partial", "runtime_warning": true, "evidence": "packages/edit-store/src/internal-model.ts needsLayersEngine/copyMediaSourceFields; packages/frame-engine/src/timeline/plan.ts KNOWN_CUT_KEYS/KNOWN_LAYER_KEYS omit chroma_key", "note": "透過 intent は layers 振り分けに使うが、frame-engine 自体は chroma key 抽出や background 置換をしない" },