mulmocast 2.1.18 → 2.1.19

package/lib/actions/movie.d.ts

@@ -28,7 +28,7 @@ export declare const getTransitionVideoId: (transition: MulmoTransition, videoId
 };
 export declare const getConcatVideoFilter: (concatVideoId: string, videoIdsForBeats: VideoId[]) => string;
 export declare const validateBeatSource: (studioBeat: MulmoStudioContext["studio"]["beats"][number], index: number) => string;
-export declare const addSplitAndExtractFrames: (ffmpegContext: FfmpegContext, videoId: string, duration: number, isMovie: boolean, needFirst: boolean, needLast: boolean, canvasInfo: {
+export declare const addSplitAndExtractFrames: (ffmpegContext: FfmpegContext, videoId: string, firstDuration: number, lastDuration: number, isMovie: boolean, needFirst: boolean, needLast: boolean, canvasInfo: {
     width: number;
     height: number;
 }) => void;

package/lib/actions/movie.js

@@ -147,8 +147,7 @@ const addTransitionEffects = (ffmpegContext, captionedVideoId, context, transiti
         // Limit transition duration to be no longer than either beat's duration
         const prevBeatDuration = context.studio.beats[beatIndex - 1].duration ?? 1;
         const currentBeatDuration = context.studio.beats[beatIndex].duration ?? 1;
-        const maxDuration = Math.min(prevBeatDuration, currentBeatDuration) * 0.9; // Use 90% to leave some margin
-        const duration = Math.min(transition.duration, maxDuration);
+        const duration = getClampedTransitionDuration(transition.duration, prevBeatDuration, currentBeatDuration);
         const outputVideoId = `trans_${beatIndex}_o`;
         const processedVideoId = `${transitionVideoId}_f`;
         if (transition.type === "fade") {
@@ -277,6 +276,33 @@ export const getConcatVideoFilter = (concatVideoId, videoIdsForBeats) => {
     const inputs = videoIds.map((id) => `[${id}]`).join("");
     return `${inputs}concat=n=${videoIds.length}:v=1:a=0[${concatVideoId}]`;
 };
+const getClampedTransitionDuration = (transitionDuration, prevBeatDuration, currentBeatDuration) => {
+    const maxDuration = Math.min(prevBeatDuration, currentBeatDuration) * 0.9; // Use 90% to leave some margin
+    return Math.min(transitionDuration, maxDuration);
+};
+const getTransitionFrameDurations = (context, index) => {
+    const minFrame = 1 / 30; // 30fpsを想定。最小1フレーム
+    const beats = context.studio.beats;
+    const scriptBeats = context.studio.script.beats;
+    const currentTransition = MulmoPresentationStyleMethods.getMovieTransition(context, scriptBeats[index]);
+    let firstDuration = 0;
+    if (currentTransition && index > 0) {
+        const prevBeatDuration = beats[index - 1].duration ?? 1;
+        const currentBeatDuration = beats[index].duration ?? 1;
+        firstDuration = getClampedTransitionDuration(currentTransition.duration, prevBeatDuration, currentBeatDuration);
+    }
+    const nextTransition = index < scriptBeats.length - 1 ? MulmoPresentationStyleMethods.getMovieTransition(context, scriptBeats[index + 1]) : null;
+    let lastDuration = 0;
+    if (nextTransition) {
+        const prevBeatDuration = beats[index].duration ?? 1;
+        const currentBeatDuration = beats[index + 1].duration ?? 1;
+        lastDuration = getClampedTransitionDuration(nextTransition.duration, prevBeatDuration, currentBeatDuration);
+    }
+    return {
+        firstDuration: Math.max(firstDuration, minFrame),
+        lastDuration: Math.max(lastDuration, minFrame),
+    };
+};
 export const validateBeatSource = (studioBeat, index) => {
     const sourceFile = studioBeat.lipSyncFile ?? studioBeat.soundEffectFile ?? studioBeat.movieFile ?? studioBeat.htmlImageFile ?? studioBeat.imageFile;
     assert(!!sourceFile, `studioBeat.imageFile or studioBeat.movieFile is not set: index=${index}`, false, createVideoSourceError(index));
@@ -284,7 +310,7 @@ export const validateBeatSource = (studioBeat, index) => {
     assert(!!studioBeat.duration, `studioBeat.duration is not set: index=${index}`);
     return sourceFile;
 };
-export const addSplitAndExtractFrames = (ffmpegContext, videoId, duration, isMovie, needFirst, needLast, canvasInfo) => {
+export const addSplitAndExtractFrames = (ffmpegContext, videoId, firstDuration, lastDuration, isMovie, needFirst, needLast, canvasInfo) => {
     const outputs = [`[${videoId}]`];
     if (needFirst)
         outputs.push(`[${videoId}_first_src]`);
@@ -294,20 +320,20 @@ export const addSplitAndExtractFrames = (ffmpegContext, videoId, duration, isMov
     if (needFirst) {
         // Create static frame using nullsrc as base for proper framerate/timebase
         // Note: setpts must NOT be used here as it loses framerate metadata needed by xfade
-        ffmpegContext.filterComplex.push(`nullsrc=size=${canvasInfo.width}x${canvasInfo.height}:duration=${duration}:rate=30[${videoId}_first_null]`);
+        ffmpegContext.filterComplex.push(`nullsrc=size=${canvasInfo.width}x${canvasInfo.height}:duration=${firstDuration}:rate=30[${videoId}_first_null]`);
         ffmpegContext.filterComplex.push(`[${videoId}_first_src]select='eq(n,0)',scale=${canvasInfo.width}:${canvasInfo.height}[${videoId}_first_frame]`);
         ffmpegContext.filterComplex.push(`[${videoId}_first_null][${videoId}_first_frame]overlay=format=auto,fps=30[${videoId}_first]`);
     }
     if (needLast) {
         if (isMovie) {
             // Movie beats: extract actual last frame
-            ffmpegContext.filterComplex.push(`nullsrc=size=${canvasInfo.width}x${canvasInfo.height}:duration=${duration}:rate=30[${videoId}_last_null]`);
+            ffmpegContext.filterComplex.push(`nullsrc=size=${canvasInfo.width}x${canvasInfo.height}:duration=${lastDuration}:rate=30[${videoId}_last_null]`);
             ffmpegContext.filterComplex.push(`[${videoId}_last_src]reverse,select='eq(n,0)',reverse,scale=${canvasInfo.width}:${canvasInfo.height}[${videoId}_last_frame]`);
             ffmpegContext.filterComplex.push(`[${videoId}_last_null][${videoId}_last_frame]overlay=format=auto,fps=30[${videoId}_last]`);
         }
         else {
             // Image beats: all frames are identical, so just select one
-            ffmpegContext.filterComplex.push(`nullsrc=size=${canvasInfo.width}x${canvasInfo.height}:duration=${duration}:rate=30[${videoId}_last_null]`);
+            ffmpegContext.filterComplex.push(`nullsrc=size=${canvasInfo.width}x${canvasInfo.height}:duration=${lastDuration}:rate=30[${videoId}_last_null]`);
             ffmpegContext.filterComplex.push(`[${videoId}_last_src]select='eq(n,0)',scale=${canvasInfo.width}:${canvasInfo.height}[${videoId}_last_frame]`);
             ffmpegContext.filterComplex.push(`[${videoId}_last_null][${videoId}_last_frame]overlay=format=auto,fps=30[${videoId}_last]`);
         }
@@ -364,7 +390,8 @@ export const createVideo = async (audioArtifactFilePath, outputVideoPath, contex
         const needLast = needsLastFrame[index]; // Next beat has transition
         videoIdsForBeats.push(videoId);
         if (needFirst || needLast) {
-            addSplitAndExtractFrames(ffmpegContext, videoId, duration, isMovie, needFirst, needLast, canvasInfo);
+            const { firstDuration, lastDuration } = getTransitionFrameDurations(context, index);
+            addSplitAndExtractFrames(ffmpegContext, videoId, firstDuration, lastDuration, isMovie, needFirst, needLast, canvasInfo);
         }
         // Record transition info if this beat has a transition
         const transition = MulmoPresentationStyleMethods.getMovieTransition(context, beat);

package/lib/utils/error_cause.js

@@ -252,8 +252,8 @@ export const getGenAIErrorReason = (error) => {
             }
         }
     }
-    catch (__error) {
-        // nothing.
+    catch {
+        // Ignore JSON parse errors - return undefined if parsing fails
     }
     return undefined;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mulmocast",
-  "version": "2.1.18",
+  "version": "2.1.19",
   "description": "",
   "type": "module",
   "main": "lib/index.node.js",
@@ -74,10 +74,10 @@
   "homepage": "https://github.com/receptron/mulmocast-cli#readme",
   "dependencies": {
     "@google-cloud/text-to-speech": "^6.4.0",
-    "@google/genai": "^1.37.0",
+    "@google/genai": "^1.38.0",
     "@graphai/anthropic_agent": "^2.0.12",
     "@graphai/browserless_agent": "^2.0.1",
-    "@graphai/gemini_agent": "^2.0.2",
+    "@graphai/gemini_agent": "^2.0.4",
     "@graphai/groq_agent": "^2.0.2",
     "@graphai/input_agents": "^1.0.2",
     "@graphai/openai_agent": "^2.0.8",
@@ -86,23 +86,23 @@
     "@graphai/vanilla_node_agents": "^2.0.4",
     "@inquirer/input": "^5.0.4",
     "@inquirer/select": "^5.0.4",
-    "@modelcontextprotocol/sdk": "^1.25.1",
+    "@modelcontextprotocol/sdk": "^1.25.3",
     "@mozilla/readability": "^0.6.0",
     "@tavily/core": "^0.5.11",
     "archiver": "^7.0.1",
-    "clipboardy": "^5.0.2",
+    "clipboardy": "^5.1.0",
     "dotenv": "^17.2.3",
     "fluent-ffmpeg": "^2.1.3",
     "graphai": "^2.0.16",
     "jsdom": "^27.4.0",
     "marked": "^17.0.1",
     "mulmocast-vision": "^1.0.8",
-    "ora": "^9.0.0",
-    "puppeteer": "^24.35.0",
+    "ora": "^9.1.0",
+    "puppeteer": "^24.36.0",
     "replicate": "^1.4.0",
     "yaml": "^2.8.2",
     "yargs": "^18.0.0",
-    "zod": "^4.3.5"
+    "zod": "^4.3.6"
   },
   "devDependencies": {
     "@receptron/test_utils": "^2.0.3",
@@ -114,10 +114,10 @@
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-sonarjs": "^3.0.5",
-    "prettier": "^3.8.0",
+    "prettier": "^3.8.1",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.53.0"
+    "typescript-eslint": "^8.53.1"
   },
   "engines": {
     "node": ">=20.0.0"