cerevox 4.5.3 → 4.6.1

package/dist/mcp/servers/zerocut.js

@@ -1005,8 +1005,9 @@ server.registerTool('generate-image', {
                             const startFrame = scene.start_frame;
                             const endFrame = scene.end_frame;
                             // 检查 prompt 是否严格等于 start_frame 或 end_frame
-                            if (prompt !== startFrame && prompt !== endFrame) {
-                                return createErrorResponse('图片提示词必须严格遵照storyboard的设定，内容完全一致，包括空格、回车、标点和特殊符号', 'generate-image');
+                            if (prompt.trim() !== startFrame?.trim() &&
+                                prompt.trim() !== endFrame?.trim()) {
+                                return createErrorResponse('图片提示词必须严格遵照storyboard的设定，内容完全一致，包括空格、回车、标点和特殊符号，检查传入的prompt参数与storyboard中的start_frame或end_frame是否完全一致', 'generate-image');
                             }
                             if (hasOutlineSheet &&
                                 (!referenceImages ||
@@ -1964,8 +1965,8 @@ server.registerTool('generate-video', {
                         const scene = storyBoard.scenes[sceneIndex - 1]; // sceneIndex 从1开始，数组从0开始
                         if (scene) {
                             const videoPrompt = scene.video_prompt;
-                            if (videoPrompt && prompt !== videoPrompt) {
-                                return createErrorResponse('视频提示词必须严格遵照storyboard的设定，内容完全一致，包括空格、回车、标点和特殊符号', 'generate-video');
+                            if (videoPrompt && prompt.trim() !== videoPrompt?.trim()) {
+                                return createErrorResponse('视频提示词必须严格遵照storyboard的设定，内容完全一致，包括空格、回车、标点和特殊符号，检查传入的prompt参数与storyboard中的video_prompt是否完全一致', 'generate-video');
                             }
                             if (scene.is_continuous && !end_frame) {
                                 return createErrorResponse('连续分镜必须指定end_frame参数', 'generate-video');
@@ -2387,8 +2388,13 @@ server.registerTool('generate-video-by-ref', {
             .optional()
             .default(true)
             .describe('默认true，自动规范化镜头语言'),
+        autoStoryboard: zod_1.z
+            .boolean()
+            .optional()
+            .default(false)
+            .describe('自动生成分镜宫格（智能分镜），默认不启用，除非用户明确要求使用'),
     },
-}, async ({ prompt, referenceImages, duration, aspectRatio, resolution, type = 'vidu', audio = false, saveToFileName, sceneIndex, optimizeCameraMotion, seed, referenceVideo, }, context) => {
+}, async ({ prompt, referenceImages, duration, aspectRatio, resolution, type = 'vidu', audio = false, saveToFileName, sceneIndex, optimizeCameraMotion, seed, referenceVideo, autoStoryboard, }, context) => {
     try {
         const storyBoardFile = 'storyboard.json';
         // 验证session状态
@@ -2423,8 +2429,8 @@ server.registerTool('generate-video-by-ref', {
                         const scene = storyBoard.scenes[sceneIndex - 1]; // sceneIndex 从1开始，数组从0开始
                         if (scene) {
                             const videoPrompt = scene.video_prompt;
-                            if (videoPrompt && prompt !== videoPrompt) {
-                                return createErrorResponse('视频提示词必须严格遵照storyboard的设定，内容完全一致，包括空格、回车、标点和特殊符号', 'generate-video-by-ref');
+                            if (videoPrompt && prompt.trim() !== videoPrompt?.trim()) {
+                                return createErrorResponse('视频提示词必须严格遵照storyboard的设定，内容完全一致，包括空格、回车、标点和特殊符号，检查传入的prompt参数与storyboard中的video_prompt是否完全一致', 'generate-video-by-ref');
                             }
                             // 检查 scene.is_continuous 是否为 true
                             if (scene.is_continuous === true) {
@@ -2543,6 +2549,7 @@ server.registerTool('generate-video-by-ref', {
             ]
             : undefined;
         // 调用 referencesToVideo 函数
+        let progress = 0;
         const result = await currentSession.ai.referencesToVideo({
             prompt: finalPrompt,
             reference_images: referenceImageUrls, // 使用URL数组而不是base64数组
@@ -2554,9 +2561,10 @@ server.registerTool('generate-video-by-ref', {
             seed,
             videos,
             optimizeCameraMotion,
+            autoStoryboard,
             onProgress: metaData => {
                 console.log('Video generation progress:', metaData);
-                sendProgress(context, metaData.progress || 0, 100, 'Generating video...');
+                sendProgress(context, ++progress, undefined, JSON.stringify(metaData));
             },
             waitForFinish: CLIENT_TYPE !== '5ire',
         });
@@ -3016,82 +3024,97 @@ server.registerTool('audio-video-sync', {
         return createErrorResponse(error, 'lip-sync');
     }
 });
-server.registerTool('add-subtitles', {
-    title: 'Add Subtitles to Video',
-    description: '给已有视频添加字幕',
-    inputSchema: {
-        videoFileName: zod_1.z.string().describe('材料目录中的视频文件名'),
-        subtitles: zod_1.z
-            .object({
-            text: zod_1.z.string().optional(),
-            style: zod_1.z
-                .object({
-                font_size: zod_1.z.number().optional(),
-                font_color: zod_1.z.string().optional(),
-                border_color: zod_1.z.string().optional(),
-                border_width: zod_1.z.number().optional(),
-                font_pos_config: zod_1.z
-                    .object({
-                    pos_x: zod_1.z.string().optional(),
-                    pos_y: zod_1.z.string().optional(),
-                    height: zod_1.z.string().optional(),
-                    width: zod_1.z.string().optional(),
-                })
-                    .optional(),
-            })
-                .optional(),
-        })
-            .optional(),
-        subtitlesContext: zod_1.z.string().optional(),
-        saveToFileName: zod_1.z.string().describe('应该是mp4文件'),
-    },
-}, async ({ videoFileName, subtitles, subtitlesContext, saveToFileName }) => {
-    try {
-        const currentSession = await validateSession('add-subtitles');
-        const validatedFileName = validateFileName(saveToFileName);
-        const videoUrl = await getMaterialUri(currentSession, videoFileName);
-        const ai = currentSession.ai;
-        const res = await ai.addVideoSubtitles({
-            videoUrl,
-            subtitles,
-            subtitlesContext,
-        });
-        if (res.url) {
-            const video = await saveMaterial(currentSession, res.url, validatedFileName);
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify({
-                            success: true,
-                            video,
-                            filename: validatedFileName,
-                            timestamp: new Date().toISOString(),
-                        }),
-                    },
-                ],
-            };
-        }
-        else {
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify({
-                            success: false,
-                            error: 'No video URL returned from subtitles service',
-                            response: res,
-                            timestamp: new Date().toISOString(),
-                        }),
-                    },
-                ],
-            };
-        }
-    }
-    catch (error) {
-        return createErrorResponse(error, 'add-subtitles');
-    }
-});
+// server.registerTool(
+//   'add-subtitles',
+//   {
+//     title: 'Add Subtitles to Video',
+//     description:
+//       '给已有视频添加字幕，audio-video-sync工具中可直接同步字幕，不需要这个工具',
+//     inputSchema: {
+//       videoFileName: z.string().describe('材料目录中的视频文件名'),
+//       subtitles: z
+//         .object({
+//           text: z.string().optional(),
+//           style: z
+//             .object({
+//               font_size: z.number().optional(),
+//               font_color: z.string().optional(),
+//               border_color: z.string().optional(),
+//               border_width: z.number().optional(),
+//               font_pos_config: z
+//                 .object({
+//                   pos_x: z.string().describe('只能用百分比格式'),
+//                   pos_y: z.string().describe('只能用百分比格式'),
+//                   height: z.string().describe('只能用百分比格式'),
+//                   width: z.string().describe('只能用百分比格式'),
+//                 })
+//                 .optional(),
+//             })
+//             .optional(),
+//         })
+//         .optional(),
+//       subtitlesContext: z.string().optional(),
+//       saveToFileName: z.string().describe('应该是mp4文件'),
+//     },
+//   },
+//   async ({ videoFileName, subtitles, subtitlesContext, saveToFileName }) => {
+//     try {
+//       const currentSession = await validateSession('add-subtitles');
+//       const validatedFileName = validateFileName(saveToFileName);
+//       const videoUrl = await getMaterialUri(currentSession, videoFileName);
+//       const ai = currentSession.ai;
+//       if (subtitles?.style && !subtitles.style.font_pos_config) {
+//         subtitles.style.font_pos_config = {
+//           height: '15%',
+//           pos_x: '5%',
+//           pos_y: '85%',
+//           width: '90%',
+//         };
+//       }
+//       const res = await ai.addVideoSubtitles({
+//         videoUrl,
+//         subtitles,
+//         subtitlesContext,
+//       });
+//       if (res.url) {
+//         const video = await saveMaterial(
+//           currentSession,
+//           res.url,
+//           validatedFileName
+//         );
+//         return {
+//           content: [
+//             {
+//               type: 'text',
+//               text: JSON.stringify({
+//                 success: true,
+//                 video,
+//                 filename: validatedFileName,
+//                 timestamp: new Date().toISOString(),
+//               }),
+//             },
+//           ],
+//         };
+//       } else {
+//         return {
+//           content: [
+//             {
+//               type: 'text',
+//               text: JSON.stringify({
+//                 success: false,
+//                 error: 'No video URL returned from subtitles service',
+//                 response: res,
+//                 timestamp: new Date().toISOString(),
+//               }),
+//             },
+//           ],
+//         };
+//       }
+//     } catch (error) {
+//       return createErrorResponse(error, 'add-subtitles');
+//     }
+//   }
+// );
 server.registerTool('use-template', {
     title: 'Use Template',
     description: 'Find a template that matches the user request, and use it to generate a new material.',