akari-video 0.1.59 → 0.1.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akari-video",
-  "version": "0.1.59",
+  "version": "0.1.61",
   "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.59",
+  "version": "0.1.61",
   "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-store/lib/audio-schedule.d.ts

@@ -1,5 +1,5 @@
 import { DuckInterval } from './ducking';
-import type { EditCut } from './edit-store';
+import { type EditCut } from './edit-store';
 export type WebAudioScheduleKind = 'bgm' | 'sfx' | 'narration' | 'speech';
 export interface WebAudioDecodedItem {
     id?: string;

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

@@ -6,6 +6,7 @@ const audio_ownership_1 = require("./audio-ownership");
 const ducking_1 = require("./ducking");
 const envelope_1 = require("./envelope");
 const timeline_map_1 = require("./timeline-map");
+const edit_store_1 = require("./edit-store");
 /**
  * 解決済みタイムライン尺・正規化済み audio 宣言・デコード実尺を、Web Audio がそのまま
  * 消費できる予定表へ落とす。fetch/decode/時計は扱わないため、実時間と OfflineAudioContext
@@ -305,21 +306,45 @@ function projectSpeechDeclarations(cuts, options) {
         return { ...cut, out: cut.out + holdSec * speed };
     });
     const map = (0, timeline_map_1.buildTimelineMap)(virtualCuts, { fps });
+    // Keep every clip's window, including clips absent from the visual winner map.
+    // Match buildTimelineMap's usable-cut filtering before resolving track cursors.
+    const usable = virtualCuts.map((cut, index) => ({ cut, index })).filter(({ cut }) => Number.isFinite(cut.in) && Number.isFinite(cut.out) && cut.in < cut.out);
+    const clipWindows = new Map((0, edit_store_1.computeCutTrackSegments)(usable.map(entry => entry.cut)).map(segment => [
+        usable[segment.index].index,
+        { start: segment.at, end: segment.end, cutTimelineStart: segment.at }
+    ]));
+    for (const window of map.transitionWindows) {
+        for (const participant of [window.outgoing, window.incoming]) {
+            const clip = clipWindows.get(participant.cutIndex);
+            const cut = normalizedCuts[participant.cutIndex];
+            if (!clip || !cut || typeof participant.in !== 'number')
+                continue;
+            const speed = finitePositive(cut.speed) ? cut.speed : 1;
+            // Transition slices retain the source mapping after hidden-handle adjustment,
+            // even when another track completely covers both participants.
+            clip.cutTimelineStart = participant.outStart - (participant.in - cut.in) / speed;
+        }
+        const outgoing = clipWindows.get(window.outgoing.cutIndex);
+        const incoming = clipWindows.get(window.incoming.cutIndex);
+        if (outgoing)
+            outgoing.end = Math.max(outgoing.end, window.end);
+        // scheduleSpeech adds this incoming overlap back via crossfadeInSec. Keep the
+        // existing declaration boundary so the transition is not applied twice.
+        if (incoming)
+            incoming.start = Math.max(incoming.start, window.end);
+    }
     const declarations = [];
-    for (const segment of map.segments) {
-        if (segment.kind !== 'src' || segment.cutIndex === null)
-            continue;
-        const cut = normalizedCuts[segment.cutIndex];
+    for (const [cutIndex, clip] of clipWindows) {
+        const cut = normalizedCuts[cutIndex];
         if (!cut || typeof cut.src !== 'string' || !cut.src)
             continue;
         if (!(0, audio_ownership_1.isCutAudioAudible)(cut))
             continue;
         const speed = finitePositive(cut.speed) ? cut.speed : 1;
-        const segmentIn = typeof segment.in === 'number' ? segment.in : cut.in;
-        const cutTimelineStart = segment.outStart - (segmentIn - cut.in) / speed;
+        const cutTimelineStart = clip.cutTimelineStart;
         const baseDurationSec = Math.max(0, cut.out - cut.in) / speed;
         const gainDb = speechGainDb(cut);
-        const baseId = typeof cut.id === 'string' && cut.id ? cut.id : `cut-${segment.cutIndex}`;
+        const baseId = speechBaseId(cut, cutIndex);
         const holdSec = freezeDuration(cut.freeze);
         if (!(holdSec > 0)) {
             appendSpeechIntersection(declarations, {
@@ -327,8 +352,8 @@ function projectSpeechDeclarations(cuts, options) {
                 sourceIn: cut.in,
                 outputStart: cutTimelineStart,
                 outputEnd: cutTimelineStart + baseDurationSec,
-                segmentStart: segment.outStart,
-                segmentEnd: segment.outEnd,
+                clipStart: clip.start,
+                clipEnd: clip.end,
                 track: cut.track
             });
             continue;
@@ -340,8 +365,8 @@ function projectSpeechDeclarations(cuts, options) {
             sourceIn: cut.in,
             outputStart: cutTimelineStart,
             outputEnd: cutTimelineStart + freezeAtSec,
-            segmentStart: segment.outStart,
-            segmentEnd: segment.outEnd,
+            clipStart: clip.start,
+            clipEnd: clip.end,
             track: cut.track
         });
         appendSpeechIntersection(declarations, {
@@ -349,8 +374,8 @@ function projectSpeechDeclarations(cuts, options) {
             sourceIn: freezeSourceIn,
             outputStart: cutTimelineStart + freezeAtSec + holdSec,
             outputEnd: cutTimelineStart + baseDurationSec + holdSec,
-            segmentStart: segment.outStart,
-            segmentEnd: segment.outEnd,
+            clipStart: clip.start,
+            clipEnd: clip.end,
             track: cut.track
         });
     }
@@ -381,8 +406,8 @@ function speechBaseId(cut, index) {
     return cut && typeof cut.id === 'string' && cut.id ? cut.id : `cut-${index}`;
 }
 function appendSpeechIntersection(declarations, input) {
-    const atSec = Math.max(input.outputStart, input.segmentStart);
-    const endSec = Math.min(input.outputEnd, input.segmentEnd);
+    const atSec = Math.max(input.outputStart, input.clipStart);
+    const endSec = Math.min(input.outputEnd, input.clipEnd);
     if (!(endSec > atSec))
         return;
     const inSec = input.sourceIn + (atSec - input.outputStart) * input.speed;

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

@@ -1452,18 +1452,34 @@ var AkariEditKernel = (() => {
       return { ...cut, out: cut.out + holdSec * speed };
     });
     const map = buildTimelineMap(virtualCuts, { fps });
+    const usable = virtualCuts.map((cut, index) => ({ cut, index })).filter(({ cut }) => Number.isFinite(cut.in) && Number.isFinite(cut.out) && cut.in < cut.out);
+    const clipWindows = new Map(computeCutTrackSegments(usable.map((entry) => entry.cut)).map((segment) => [
+      usable[segment.index].index,
+      { start: segment.at, end: segment.end, cutTimelineStart: segment.at }
+    ]));
+    for (const window of map.transitionWindows) {
+      for (const participant of [window.outgoing, window.incoming]) {
+        const clip = clipWindows.get(participant.cutIndex);
+        const cut = normalizedCuts[participant.cutIndex];
+        if (!clip || !cut || typeof participant.in !== "number") continue;
+        const speed = finitePositive(cut.speed) ? cut.speed : 1;
+        clip.cutTimelineStart = participant.outStart - (participant.in - cut.in) / speed;
+      }
+      const outgoing = clipWindows.get(window.outgoing.cutIndex);
+      const incoming = clipWindows.get(window.incoming.cutIndex);
+      if (outgoing) outgoing.end = Math.max(outgoing.end, window.end);
+      if (incoming) incoming.start = Math.max(incoming.start, window.end);
+    }
     const declarations = [];
-    for (const segment of map.segments) {
-      if (segment.kind !== "src" || segment.cutIndex === null) continue;
-      const cut = normalizedCuts[segment.cutIndex];
+    for (const [cutIndex, clip] of clipWindows) {
+      const cut = normalizedCuts[cutIndex];
       if (!cut || typeof cut.src !== "string" || !cut.src) continue;
       if (!isCutAudioAudible(cut)) continue;
       const speed = finitePositive(cut.speed) ? cut.speed : 1;
-      const segmentIn = typeof segment.in === "number" ? segment.in : cut.in;
-      const cutTimelineStart = segment.outStart - (segmentIn - cut.in) / speed;
+      const cutTimelineStart = clip.cutTimelineStart;
       const baseDurationSec = Math.max(0, cut.out - cut.in) / speed;
       const gainDb = speechGainDb(cut);
-      const baseId = typeof cut.id === "string" && cut.id ? cut.id : `cut-${segment.cutIndex}`;
+      const baseId = speechBaseId(cut, cutIndex);
       const holdSec = freezeDuration(cut.freeze);
       if (!(holdSec > 0)) {
         appendSpeechIntersection(declarations, {
@@ -1474,8 +1490,8 @@ var AkariEditKernel = (() => {
           sourceIn: cut.in,
           outputStart: cutTimelineStart,
           outputEnd: cutTimelineStart + baseDurationSec,
-          segmentStart: segment.outStart,
-          segmentEnd: segment.outEnd,
+          clipStart: clip.start,
+          clipEnd: clip.end,
           track: cut.track
         });
         continue;
@@ -1490,8 +1506,8 @@ var AkariEditKernel = (() => {
         sourceIn: cut.in,
         outputStart: cutTimelineStart,
         outputEnd: cutTimelineStart + freezeAtSec,
-        segmentStart: segment.outStart,
-        segmentEnd: segment.outEnd,
+        clipStart: clip.start,
+        clipEnd: clip.end,
         track: cut.track
       });
       appendSpeechIntersection(declarations, {
@@ -1502,8 +1518,8 @@ var AkariEditKernel = (() => {
         sourceIn: freezeSourceIn,
         outputStart: cutTimelineStart + freezeAtSec + holdSec,
         outputEnd: cutTimelineStart + baseDurationSec + holdSec,
-        segmentStart: segment.outStart,
-        segmentEnd: segment.outEnd,
+        clipStart: clip.start,
+        clipEnd: clip.end,
         track: cut.track
       });
     }
@@ -1530,8 +1546,8 @@ var AkariEditKernel = (() => {
     return cut && typeof cut.id === "string" && cut.id ? cut.id : `cut-${index}`;
   }
   function appendSpeechIntersection(declarations, input) {
-    const atSec = Math.max(input.outputStart, input.segmentStart);
-    const endSec = Math.min(input.outputEnd, input.segmentEnd);
+    const atSec = Math.max(input.outputStart, input.clipStart);
+    const endSec = Math.min(input.outputEnd, input.clipEnd);
     if (!(endSec > atSec)) return;
     const inSec = input.sourceIn + (atSec - input.outputStart) * input.speed;
     const outSec = inSec + (endSec - atSec) * input.speed;