akari-video 0.1.60 → 0.1.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akari-video",
-  "version": "0.1.60",
+  "version": "0.1.62",
   "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.60",
+  "version": "0.1.62",
   "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-ownership.d.ts

@@ -11,3 +11,13 @@ export declare function isCutAudioAudible(cut: {
 }, track?: {
     muted?: unknown;
 }): boolean;
+/** Video layers own embedded speech even when their pixels are hidden or transformed. */
+export declare function isLayerAudioAudible(layer: {
+    kind?: unknown;
+    src?: unknown;
+    isImage?: unknown;
+    audio?: unknown;
+    mute?: unknown;
+}, track?: {
+    muted?: unknown;
+}): boolean;

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isAudioItemAudible = isAudioItemAudible;
 exports.isCutAudioAudible = isCutAudioAudible;
+exports.isLayerAudioAudible = isLayerAudioAudible;
 /** Audibility belongs to the owning track and item, independently of its speech role. */
 function isAudioItemAudible(track, item) {
     return track?.muted !== true && item?.mute !== true;
@@ -10,3 +11,10 @@ function isAudioItemAudible(track, item) {
 function isCutAudioAudible(cut, track) {
     return cut.audio !== false && isAudioItemAudible(track, cut);
 }
+/** Video layers own embedded speech even when their pixels are hidden or transformed. */
+function isLayerAudioAudible(layer, track) {
+    return layer.kind === 'video' && layer.isImage !== true
+        && typeof layer.src === 'string' && layer.src.length > 0
+        && !/\.(?:png|jpe?g|webp|bmp|gif|svg)(?:[?#].*)?$/iu.test(layer.src)
+        && isCutAudioAudible(layer, track);
+}

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;
@@ -138,4 +138,27 @@ export declare function buildWebAudioSchedule(input: WebAudioScheduleInput): Web
  */
 export declare function projectSpeechDeclarations(cuts: readonly WebAudioSpeechCut[], options: {
     fps: number;
+    layers?: readonly WebAudioSpeechLayer[];
 }): WebAudioSpeechDeclaration[];
+/** Layer timing is output time; only moving source regions supply speech. */
+export interface WebAudioSpeechLayer {
+    id?: string;
+    kind?: string;
+    src?: string;
+    isImage?: boolean;
+    t: number;
+    duration: number;
+    in?: number;
+    speed?: number;
+    track?: number;
+    audio?: boolean;
+    mute?: unknown;
+    gain_db?: unknown;
+    freeze?: WebAudioSpeechCut['freeze'];
+    transition_out?: WebAudioSpeechCut['transition_out'];
+}
+export declare function projectLayerSpeechDeclarations(layers: readonly WebAudioSpeechLayer[], options: {
+    fps: number;
+}): Array<WebAudioSpeechDeclaration & {
+    scope: 'layers';
+}>;

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

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildWebAudioSchedule = buildWebAudioSchedule;
 exports.projectSpeechDeclarations = projectSpeechDeclarations;
+exports.projectLayerSpeechDeclarations = projectLayerSpeechDeclarations;
 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 +307,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 +353,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 +366,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 +375,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
         });
     }
@@ -375,14 +401,32 @@ function projectSpeechDeclarations(cuts, options) {
             incoming.crossfadeInSec = Math.max(incoming.crossfadeInSec ?? 0, window.duration);
         }
     }
+    if (options.layers?.length)
+        declarations.push(...projectLayerSpeechDeclarations(options.layers, { fps }));
     return declarations;
 }
+function projectLayerSpeechDeclarations(layers, options) {
+    const cuts = layers.map((layer, index) => {
+        const speed = finitePositive(layer.speed) ? layer.speed : 1;
+        const sourceIn = finiteNonNegative(layer.in) ? layer.in : 0;
+        return {
+            ...layer,
+            id: `layer-${layer.id || index}`,
+            in: sourceIn,
+            out: sourceIn + Math.max(0, layer.duration - freezeDuration(layer.freeze)) * speed,
+            at: layer.t,
+            speed,
+            audio: (0, audio_ownership_1.isLayerAudioAudible)(layer) ? undefined : false,
+        };
+    });
+    return projectSpeechDeclarations(cuts, options).map(item => ({ ...item, scope: 'layers' }));
+}
 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/internal-model.js

@@ -1130,7 +1130,8 @@ function projectLegacyEdit(internal) {
                             audioBgm = value;
                             break;
                         case 'layers':
-                            layers.push({ index: item.legacy.index, value: value });
+                            layers.push({ index: item.legacy.index, value: (track.lane === 'visual' && track.muted === true
+                                    ? { ...value, mute: true } : value) });
                             break;
                         default:
                             cuts.push({

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

@@ -48,11 +48,13 @@ var AkariEditKernel = (() => {
     findActiveResolvedCaption: () => findActiveResolvedCaption,
     isAudioItemAudible: () => isAudioItemAudible,
     isCutAudioAudible: () => isCutAudioAudible,
+    isLayerAudioAudible: () => isLayerAudioAudible,
     isTransitionType: () => isTransitionType,
     isWithinDuckInterval: () => isWithinDuckInterval,
     mergePresetTextStyle: () => mergePresetTextStyle,
     normalizeCaptionClock: () => normalizeCaptionClock,
     outputToSource: () => outputToSource,
+    projectLayerSpeechDeclarations: () => projectLayerSpeechDeclarations,
     projectSpeechDeclarations: () => projectSpeechDeclarations,
     projectSpeechKeyIntervals: () => projectSpeechKeyIntervals,
     resolveCaptionStylePreset: () => resolveCaptionStylePreset,
@@ -1154,6 +1156,9 @@ var AkariEditKernel = (() => {
   function isCutAudioAudible(cut, track) {
     return cut.audio !== false && isAudioItemAudible(track, cut);
   }
+  function isLayerAudioAudible(layer, track) {
+    return layer.kind === "video" && layer.isImage !== true && typeof layer.src === "string" && layer.src.length > 0 && !/\.(?:png|jpe?g|webp|bmp|gif|svg)(?:[?#].*)?$/iu.test(layer.src) && isCutAudioAudible(layer, track);
+  }
 
   // src/audio-schedule.ts
   function buildWebAudioSchedule(input) {
@@ -1452,18 +1457,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 +1495,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 +1511,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 +1523,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
       });
     }
@@ -1524,14 +1545,31 @@ var AkariEditKernel = (() => {
         incoming.crossfadeInSec = Math.max(incoming.crossfadeInSec ?? 0, window.duration);
       }
     }
+    if (options.layers?.length) declarations.push(...projectLayerSpeechDeclarations(options.layers, { fps }));
     return declarations;
   }
+  function projectLayerSpeechDeclarations(layers, options) {
+    const cuts = layers.map((layer, index) => {
+      const speed = finitePositive(layer.speed) ? layer.speed : 1;
+      const sourceIn = finiteNonNegative(layer.in) ? layer.in : 0;
+      return {
+        ...layer,
+        id: `layer-${layer.id || index}`,
+        in: sourceIn,
+        out: sourceIn + Math.max(0, layer.duration - freezeDuration(layer.freeze)) * speed,
+        at: layer.t,
+        speed,
+        audio: isLayerAudioAudible(layer) ? void 0 : false
+      };
+    });
+    return projectSpeechDeclarations(cuts, options).map((item) => ({ ...item, scope: "layers" }));
+  }
   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;
     const outSec = inSec + (endSec - atSec) * input.speed;
@@ -3489,7 +3527,7 @@ var AkariEditKernel = (() => {
                 audioBgm = value;
                 break;
               case "layers":
-                layers.push({ index: item.legacy.index, value });
+                layers.push({ index: item.legacy.index, value: track.lane === "visual" && track.muted === true ? { ...value, mute: true } : value });
                 break;
               default:
                 cuts.push({

package/vendor/packages/schemas/edit.schema.json

@@ -1368,6 +1368,8 @@
         "duration": { "$ref": "#/$defs/positiveNumber" },
         "kind": { "enum": ["baked", "video", "filter"] },
         "src": { "type": "string", "minLength": 1, "pattern": "\\S" },
+        "audio": { "type": "boolean", "default": true, "description": "Play embedded audio for video layers; ignored for other kinds." },
+        "gain_db": { "type": "number", "minimum": -60, "maximum": 12, "default": 0 },
         "filter": { "$ref": "#/$defs/layerFilter" },
         "preset": { "type": "string" },
         "params": { "type": "object" },

package/vendor/packages/schemas/test/layer-audio.test.mjs

@@ -0,0 +1,25 @@
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import test from 'node:test';
+import Ajv2020 from 'ajv/dist/2020.js';
+const schema = JSON.parse(readFileSync(new URL('../edit.schema.json', import.meta.url), 'utf8'));
+const layer = () => ({ id: 'pip', kind: 'video', src: 'pip.mov', t: 1, duration: 3 });
+const compile = useDefaults => new Ajv2020({ strict: false, useDefaults }).compile({
+  $defs: schema.$defs, $ref: '#/$defs/layerItem',
+});
+test('legacy layer audio omission stays valid and defaults to audible at 0 dB', () => {
+  const value = layer(), before = JSON.stringify(value);
+  assert.equal(compile(false)(value), true);
+  assert.equal(JSON.stringify(value), before);
+  assert.equal(compile(true)(value), true);
+  assert.equal(value.audio, true);
+  assert.equal(value.gain_db, 0);
+});
+test('layer audio accepts booleans and gain endpoints, rejecting wrong types and ranges', () => {
+  const validate = compile(false);
+  for (const audio of [true, false]) for (const gain_db of [-60, 0, 12]) {
+    assert.equal(validate({ ...layer(), audio, gain_db }), true);
+  }
+  for (const audio of [0, null, 'false']) assert.equal(validate({ ...layer(), audio }), false);
+  for (const gain_db of [-60.1, 12.1, null, '0']) assert.equal(validate({ ...layer(), gain_db }), false);
+});