@infimind/video-mcp-cli 1.0.10 → 1.0.11

package/README.md

@@ -135,7 +135,7 @@ Use `dryRun: true` to validate parameters, VIP access, media rules, and estimate
 
 ```json
 {
-  "prompt": "@图片1 作为角色参考，生成自然的走秀镜头",
+  "prompt": "@image1 作为角色参考，生成自然的走秀镜头",
   "route": "S6",
   "taskMode": "reference",
   "sourceImages": ["/path/to/character.jpg"],
@@ -235,7 +235,7 @@ Image-to-video:
 
 ```json
 {
-  "prompt": "@图片1 和 @图片2 作为角色参考，生成自然的走秀镜头",
+  "prompt": "@image1 和 @image2 作为角色参考，生成自然的走秀镜头",
   "route": "S6",
   "taskMode": "reference",
   "sourceImages": ["/path/to/character-1.jpg", "/path/to/character-2.jpg"],
@@ -335,7 +335,7 @@ Set `SORA_API_URL=http://localhost:3000/api` when testing against a local app se
 - If a client reports schema mismatch, run `npm run build` and `npm run test:smoke` in `mcp-server`.
 - If `get_video_status` cannot connect, verify `SORA_API_URL` includes `/api`, for example `http://localhost:3000/api`.
 - If S5/S6 returns VIP errors, confirm the MCP token belongs to a VIP user.
-- If S6 reference/edit prompts contain `@图片N`, keep the original markers; those modes skip prompt translation to preserve image references.
+- If S6 reference/edit prompts contain canonical `@imageN` markers, keep the original markers; those modes skip prompt translation to preserve image references. Legacy `@图片N` markers are still accepted and normalized by the server.
 - If local file inputs fail, use absolute paths and supported media types: jpg/png/webp/gif, mp4/mov, mp3/wav.
 
 ## Publishing

package/dist/server.js

@@ -8,7 +8,7 @@ import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { CallToolRequestSchema, ListToolsRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
 import { readFileSync, existsSync, statSync } from "fs";
 import { extname, basename } from "path";
-import { MCP_SERVER_VERSION, getMcpDefaultTaskMode, getMcpEngineName, getMcpVideoStatusHint, isMcpRoute, isValidMcpTaskMode, } from "./videoRules.js";
+import { MCP_SERVER_VERSION, getMcpDefaultTaskMode, getMcpEngineName, getMcpVideoStatusHint, isMcpRoute, isValidMcpTaskMode, isMcpModel, MCP_VIDEO_MODELS, } from "./videoRules.js";
 class McpToolError extends Error {
     code;
     route;
@@ -125,10 +125,16 @@ export function createServer(token, apiBaseUrl) {
                             minimum: 1,
                             maximum: 12,
                         },
+                        model: {
+                            type: "string",
+                            description: "生成引擎短码（推荐）：SA=极睿Sa专业版（默认，Sora 2，失败自动回退 S4）、SD=极睿Sd专业版（Seedance 2.0）、HA=极睿Ha专业版（HappyHorse 1.1）。注意：SD、HA 仅限 VIP 用户使用",
+                            enum: ["SA", "SD", "HA"],
+                        },
                         route: {
                             type: "string",
-                            description: "使用的生成引擎：S2=极睿Sa专业版（默认）、S5=极睿Sd专业版、S6=极睿Ha专业版。注意：S5、S6 仅限 VIP 用户使用",
+                            description: "内部线路代码（已废弃，请改用 model）。兼容老客户端：S2=极睿Sa专业版、S5=极睿Sd专业版、S6=极睿Ha专业版",
                             enum: ["S2", "S5", "S6"],
+                            deprecated: true,
                         },
                         taskMode: {
                             type: "string",
@@ -166,8 +172,10 @@ export function createServer(token, apiBaseUrl) {
                     properties: {
                         success: { type: "boolean" },
                         taskId: { type: "number" },
+                        model: { type: "string" },
                         route: { type: "string" },
                         engineName: { type: "string" },
+                        usedRouteAlias: { type: "boolean" },
                         taskMode: { type: "string" },
                         videoCount: { type: "number" },
                         dryRun: { type: "boolean" },
@@ -209,10 +217,7 @@ export function createServer(token, apiBaseUrl) {
                         totalVideos: { type: "number" },
                         completedVideos: { type: "number" },
                         estimatedCredits: { type: "number" },
-                        chargedVideos: { type: "number" },
-                        actualRoute: { type: "string" },
                         taskMode: { type: ["string", "null"] },
-                        retryCount: { type: "number" },
                         statusHint: { type: "string" },
                         createdAt: { type: ["string", "null"] },
                         updatedAt: { type: ["string", "null"] },
@@ -238,9 +243,6 @@ export function createServer(token, apiBaseUrl) {
                                     errorCode: { type: ["string", "null"] },
                                     errorCategory: { type: ["string", "null"] },
                                     retryable: { type: ["boolean", "null"] },
-                                    actualRoute: { type: ["string", "null"] },
-                                    retryCount: { type: "number" },
-                                    creditsCharged: { type: "boolean" },
                                     createdAt: { type: ["string", "null"] },
                                     completedAt: { type: ["string", "null"] },
                                 },
@@ -470,12 +472,27 @@ function hasItems(value) {
 function itemCount(value) {
     return Array.isArray(value) ? value.filter((item) => typeof item === "string" && item.length > 0).length : 0;
 }
-function normalizeRoute(value) {
-    const route = typeof value === "string" ? value : "S2";
+function normalizeRoute(args) {
+    // 优先 model；若 model 未传或不是 SA/SD/HA，再看 route（route 现在是 deprecated alias）
+    if (args && typeof args === "object" && isMcpModel(args.model)) {
+        const m = args.model;
+        return {
+            route: MCP_VIDEO_MODELS[m].route,
+            model: m,
+            usedRouteAlias: false,
+        };
+    }
+    const raw = args && typeof args === "object" ? args.route : undefined;
+    const route = typeof raw === "string" ? raw : "S2";
     if (!isMcpRoute(route)) {
-        throw new McpToolError("route 只能是 S2、S5 或 S6。S2=极睿Sa专业版，S5=极睿Sd专业版，S6=极睿Ha专业版。", "INVALID_ROUTE");
+        throw new McpToolError("model 必须是 SA、SD 或 HA；route 只接受 S2、S5、S6（已废弃），请改用 model。", "INVALID_ENGINE");
     }
-    return route;
+    const m = route === "S2" ? "SA" : route === "S5" ? "SD" : "HA";
+    return {
+        route,
+        model: m,
+        usedRouteAlias: true,
+    };
 }
 function normalizeTaskMode(route, value) {
     const mode = typeof value === "string" ? value : getMcpDefaultTaskMode(route);
@@ -501,7 +518,8 @@ function validateCreateVideoArgs(args) {
     if (args.count !== undefined && (!Number.isInteger(args.count) || args.count < 1 || args.count > 12)) {
         throw new McpToolError("count 必须是 1-12 的整数。", "INVALID_COUNT");
     }
-    const route = normalizeRoute(args.route);
+    const norm = normalizeRoute(args);
+    const route = norm.route;
     const taskMode = normalizeTaskMode(route, args.taskMode);
     const resolution = typeof args.resolution === "string" ? args.resolution : "720p";
     const dryRun = args.dryRun === true;
@@ -587,6 +605,8 @@ function validateCreateVideoArgs(args) {
     }
     return {
         route,
+        model: norm.model,
+        usedRouteAlias: norm.usedRouteAlias,
         taskMode,
         resolution,
         dryRun,
@@ -609,6 +629,7 @@ async function handleCreateVideoTask(apiBaseUrl, token, args) {
         seconds: args.seconds || 10,
         language: args.language || "zh-CN",
         count: args.count || 1,
+        model: normalized.model,
         route: normalized.route,
         dryRun: normalized.dryRun,
     };
@@ -663,8 +684,10 @@ async function handleCreateVideoTask(apiBaseUrl, token, args) {
         structuredContent: {
             success: response.success,
             taskId: response.taskId,
+            model: response.model ?? normalized.model,
             route,
             engineName,
+            usedRouteAlias: normalized.usedRouteAlias,
             taskMode,
             videoCount: response.videoCount,
             dryRun,
@@ -693,10 +716,7 @@ async function handleGetVideoStatus(apiBaseUrl, token, args) {
         `- **进度**: ${response.progress}% (${response.completedVideos}/${response.totalVideos} 个视频)`,
         response.engineName ? `- **生成引擎**: ${response.engineName}` : undefined,
         response.taskMode ? `- **模式**: ${response.taskMode}` : undefined,
-        response.actualRoute ? `- **实际线路**: ${response.actualRoute}` : undefined,
         typeof response.estimatedCredits === "number" ? `- **预估积分**: ${response.estimatedCredits}` : undefined,
-        typeof response.chargedVideos === "number" ? `- **已扣费视频**: ${response.chargedVideos}/${response.totalVideos}` : undefined,
-        typeof response.retryCount === "number" ? `- **重试次数**: ${response.retryCount}` : undefined,
         ``,
     ].filter((line) => line !== undefined);
     if (response.errorMessage) {
@@ -726,15 +746,6 @@ async function handleGetVideoStatus(apiBaseUrl, token, args) {
             if (video.errorCode) {
                 result.push(`   错误代码: ${video.errorCode}`);
             }
-            if (video.actualRoute) {
-                result.push(`   实际线路: ${video.actualRoute}`);
-            }
-            if (typeof video.retryCount === "number" && video.retryCount > 0) {
-                result.push(`   重试次数: ${video.retryCount}`);
-            }
-            if (typeof video.creditsCharged === "boolean") {
-                result.push(`   已扣费: ${video.creditsCharged ? "是" : "否"}`);
-            }
         });
     }
     if (response.statusHint) {
@@ -757,9 +768,6 @@ async function handleGetVideoStatus(apiBaseUrl, token, args) {
             route: response.route,
             engineName: response.engineName,
             taskMode: response.taskMode,
-            actualRoute: response.actualRoute,
-            retryCount: response.retryCount,
-            chargedVideos: response.chargedVideos,
             estimatedCredits: response.estimatedCredits,
             statusHint: response.statusHint,
             createdAt: response.createdAt,

package/dist/videoRules.d.ts

@@ -14,4 +14,36 @@ export declare function getMcpEngineName(route: string): string;
 export declare function getMcpTaskModel(route: McpRoute): string;
 export declare function getMcpDefaultTaskMode(route: McpRoute, isFirstLastMode?: boolean): McpTaskMode;
 export declare function isValidMcpTaskMode(route: McpRoute, taskMode: string): taskMode is McpTaskMode;
+/**
+ * 面向 MCP 客户端的引擎短码:
+ *   SA = S2（极睿Sa专业版，Sora 2 模型，自动 S2→S4 兜底）
+ *   SD = S5（极睿Sd专业版，Seedance 2.0）
+ *   HA = S6（极睿Ha专业版，HappyHorse 1.1）
+ */
+export type McpModel = "SA" | "SD" | "HA";
+export declare const MCP_VIDEO_MODELS: Record<McpModel, {
+    route: McpRoute;
+    engineName: string;
+    providerModel: string;
+}>;
+export declare function isMcpModel(value: unknown): value is McpModel;
+export declare function getMcpModelForRoute(route: McpRoute): McpModel;
+/**
+ * 把客户端传入的 model / route 值解析成内部 route。
+ * - 如果 model 有效，直接用对应的内部 route。
+ * - 否则如果 route 是有效 McpRoute，返回该 route。
+ * - 否则返回 "SA"（与现有默认行为保持一致）。
+ *
+ * 第二返回值 true 表示 route 走的是 deprecated alias（仅使用 route 而非 model）。
+ */
+export declare function resolveMcpEngine(args: {
+    model?: unknown;
+    route?: unknown;
+}): {
+    route: McpRoute;
+    model: McpModel;
+    engineName: string;
+    providerModel: string;
+    usedRouteAlias: boolean;
+};
 export declare function getMcpVideoStatusHint(dryRun?: boolean): string;

package/dist/videoRules.js

@@ -16,7 +16,7 @@ export const MCP_VIDEO_ENGINES = {
     },
     S6: {
         engineName: "极睿Ha专业版",
-        model: "happyhorse-1.0",
+        model: "happyhorse-1.1",
         defaultTaskMode: "standard",
         taskModes: ["standard", "reference", "edit"],
     },
@@ -39,6 +39,64 @@ export function getMcpDefaultTaskMode(route, isFirstLastMode) {
 export function isValidMcpTaskMode(route, taskMode) {
     return MCP_VIDEO_ENGINES[route].taskModes.includes(taskMode);
 }
+export const MCP_VIDEO_MODELS = {
+    SA: { route: "S2", engineName: "极睿Sa专业版", providerModel: "sora-2" },
+    SD: { route: "S5", engineName: "极睿Sd专业版", providerModel: "doubao-seedance-2-0-260128" },
+    HA: { route: "S6", engineName: "极睿Ha专业版", providerModel: "happyhorse-1.1" },
+};
+export function isMcpModel(value) {
+    return value === "SA" || value === "SD" || value === "HA";
+}
+export function getMcpModelForRoute(route) {
+    if (route === "S2")
+        return "SA";
+    if (route === "S5")
+        return "SD";
+    if (route === "S6")
+        return "HA";
+    return "SA"; // 默认回退
+}
+/**
+ * 把客户端传入的 model / route 值解析成内部 route。
+ * - 如果 model 有效，直接用对应的内部 route。
+ * - 否则如果 route 是有效 McpRoute，返回该 route。
+ * - 否则返回 "SA"（与现有默认行为保持一致）。
+ *
+ * 第二返回值 true 表示 route 走的是 deprecated alias（仅使用 route 而非 model）。
+ */
+export function resolveMcpEngine(args) {
+    if (isMcpModel(args.model)) {
+        const entry = MCP_VIDEO_MODELS[args.model];
+        return {
+            route: entry.route,
+            model: args.model,
+            engineName: entry.engineName,
+            providerModel: entry.providerModel,
+            usedRouteAlias: false,
+        };
+    }
+    if (isMcpRoute(typeof args.route === "string" ? args.route : "")) {
+        const r = args.route;
+        const m = getMcpModelForRoute(r);
+        const entry = MCP_VIDEO_MODELS[m];
+        return {
+            route: r,
+            model: m,
+            engineName: entry.engineName,
+            providerModel: entry.providerModel,
+            usedRouteAlias: true,
+        };
+    }
+    // 默认 SA
+    const entry = MCP_VIDEO_MODELS.SA;
+    return {
+        route: entry.route,
+        model: "SA",
+        engineName: entry.engineName,
+        providerModel: entry.providerModel,
+        usedRouteAlias: false,
+    };
+}
 export function getMcpVideoStatusHint(dryRun) {
     return dryRun ? MCP_VIDEO_DRY_RUN_HINT : MCP_VIDEO_STATUS_HINT;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infimind/video-mcp-cli",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "MCP Server for Sora AI Video Generator - Access video generation features through Claude Desktop",
   "type": "module",
   "main": "dist/index.js",