makefx 1.0.1 → 1.0.3

package/README.md

@@ -176,4 +176,4 @@ Run `makefx --help` or `makefx help <command>` for command-specific options.
 - Media generation guide: https://makefx.app/docs/media-playbooks
 - Source: https://github.com/krasnoperov/inventory
 
-Version: 1.0.1
+Version: 1.0.3

package/makefx.mjs

@@ -4746,6 +4746,57 @@ var import_websocket = /* @__PURE__ */ __toESM(require_websocket(), 1);
 require_websocket_server();
 var wrapper_default = import_websocket.default;
 //#endregion
+//#region src/shared/generation-errors.ts
+var GENERATION_PROVIDER_AUTH_MESSAGE = "The generation provider is not configured correctly. Try again later or contact Make Effects support.";
+var MAX_GENERATION_DIAGNOSTIC_TEXT_LENGTH = 1e3;
+function extractGenerationDiagnostic(providerMetadata) {
+	if (!providerMetadata) return null;
+	try {
+		const diagnostic = JSON.parse(providerMetadata).generationDiagnostic;
+		if (diagnostic && typeof diagnostic === "object" && diagnostic.kind === "generation_error") return diagnostic;
+	} catch {
+		return null;
+	}
+	return null;
+}
+function sanitizeGenerationFailureMessage(errorMessage, providerMetadata) {
+	const diagnostic = extractGenerationDiagnostic(providerMetadata);
+	if (diagnostic?.userMessage) return redactGenerationDiagnosticText(diagnostic.userMessage) ?? "Generation failed";
+	const rawMessage = errorMessage?.trim() || "Generation failed";
+	const cleanMessage = redactGenerationDiagnosticText(extractProviderErrorMessage(rawMessage) ?? rawMessage) ?? "Generation failed";
+	if (isProviderAuthMessage(cleanMessage.toLowerCase(), void 0)) return GENERATION_PROVIDER_AUTH_MESSAGE;
+	return cleanMessage;
+}
+function redactGenerationDiagnosticText(message) {
+	if (!message) return message;
+	const redacted = message.replace(/(authorization(?:\s+header)?\s*["']?\s*[:=]\s*["']?(?:Bearer\s+)?)[^"',\s}]+/gi, "$1[redacted]").replace(/(authorization(?:\s+header)?\s+(?:Bearer\s+)?)([^"',\s}]*[0-9._~+/=-][^"',\s}]*)/gi, "$1[redacted]").replace(/\bBearer\s+[A-Za-z0-9._~+/=-]+/gi, "Bearer [redacted]").replace(/((?:x-goog-api-key|xi-api-key|api[_-\s]?key|access[_-\s]?token|refresh[_-\s]?token|id[_-\s]?token|secret)\s*["']?\s*[:=]\s*["']?)[^"',\s}]+/gi, "$1[redacted]").replace(/((?:api\s+key|access\s+token|refresh\s+token|id\s+token|secret)(?:\s+text)?\s+(?:is\s+|was\s+)?)[A-Za-z0-9._~+/=-]{6,}/gi, "$1[redacted]").replace(/([?&]key=)[^&"',\s}]+/gi, "$1[redacted]").replace(/\bAIza[0-9A-Za-z_-]{10,}\b/g, "[redacted-google-api-key]").replace(/\bsk-[A-Za-z0-9]{16,}\b/g, "[redacted-api-key]").replace(/("(?:data|imageData|audioData|videoData|mediaData|base64|bytes)"\s*:\s*")[^"]{80,}(")/gi, "$1[redacted-binary-data]$2").replace(/data:[^;,\s]+;base64,[A-Za-z0-9+/=]{80,}/gi, "[redacted-data-url]").replace(/\b[A-Za-z0-9+/]{160,}={0,2}\b/g, "[redacted-large-token]");
+	return redacted.length > MAX_GENERATION_DIAGNOSTIC_TEXT_LENGTH ? `${redacted.slice(0, MAX_GENERATION_DIAGNOSTIC_TEXT_LENGTH)}... [truncated]` : redacted;
+}
+function extractProviderErrorMessage(message) {
+	const match = message.match(/ApiError:\s*(\{.*\})/s) ?? message.match(/(?:Gemini|Google|Veo).*?:\s*(\{.*\})/s);
+	if (!match) return null;
+	try {
+		const parsed = JSON.parse(match[1]);
+		if (typeof parsed.error?.message === "string") return parsed.error.message;
+		if (typeof parsed.error?.status === "string") return parsed.error.status;
+	} catch {
+		return "Provider request failed";
+	}
+	return "Provider request failed";
+}
+function isProviderAuthMessage(message, providerErrorCode, provider) {
+	if (provider === "r2" || provider === "space_do" || provider === "workflow" || provider === "polar") return false;
+	return providerErrorCode?.toLowerCase() === "api_key_invalid" || message.includes("api_key_invalid") || message.includes("api key not valid") || message.includes("invalid api key") || message.includes("api key is required") || message.includes("not configured") || message.includes("unauthenticated");
+}
+//#endregion
+//#region src/cli/lib/error-format.ts
+function formatServerErrorMessage(code, message) {
+	return `${code}: ${formatGenerationFailureMessage(message)}`;
+}
+function formatGenerationFailureMessage(message, providerMetadata) {
+	return sanitizeGenerationFailureMessage(message, providerMetadata);
+}
+//#endregion
 //#region src/cli/commands/listen.ts
 /**
 * Listen Command - Connect to space WebSocket and stream all events
@@ -4812,6 +4863,9 @@ var eventColors = {
 	"simple_plan:archived": colors.yellow,
 	"error": colors.red
 };
+function formatListenVariantError(message, providerMetadata) {
+	return formatGenerationFailureMessage(message, providerMetadata);
+}
 async function handleListen(parsed) {
 	const projectConfig = await loadProjectConfig();
 	const env = resolveCommandEnvironment(parsed, projectConfig);
@@ -4921,7 +4975,7 @@ function printMessageDetails(message, type) {
 			const variant = message.variant;
 			if (variant) {
 				console.log(`   Variant: ${variant.id} [${variant.status}]`);
-				if (variant.error_message) console.log(`   ${colors.red}Error: ${variant.error_message}${colors.reset}`);
+				if (variant.error_message) console.log(`   ${colors.red}Error: ${formatListenVariantError(variant.error_message, variant.provider_metadata)}${colors.reset}`);
 			}
 			break;
 		}
@@ -5866,7 +5920,7 @@ var WebSocketClient = class WebSocketClient {
 	accessToken;
 	env;
 	spaceId;
-	connectionLoggingEnabled = true;
+	connectionLoggingEnabled = false;
 	chatHandlers = /* @__PURE__ */ new Map();
 	generateHandlers = /* @__PURE__ */ new Map();
 	batchHandlers = /* @__PURE__ */ new Map();
@@ -5926,11 +5980,10 @@ var WebSocketClient = class WebSocketClient {
 					const message = JSON.parse(data.toString());
 					this.handleMessage(message);
 				} catch (err) {
-					console.error("[WebSocketClient] Error parsing message:", err);
+					this.onError?.(err instanceof Error ? err : /* @__PURE__ */ new Error("Received an unreadable real-time update"));
 				}
 			});
 			this.ws.on("error", (err) => {
-				console.error("[WebSocketClient] WebSocket error:", err);
 				this.onError?.(err);
 				reject(err);
 			});
@@ -6053,7 +6106,7 @@ var WebSocketClient = class WebSocketClient {
 				if (handler) {
 					this.generateHandlers.delete(errorMsg.requestId);
 					clearTimeout(handler.timeout);
-					handler.reject(/* @__PURE__ */ new Error(`${errorMsg.code}: ${errorMsg.error}`));
+					handler.reject(new Error(formatServerErrorMessage(errorMsg.code, errorMsg.error)));
 				}
 				break;
 			}
@@ -6063,7 +6116,7 @@ var WebSocketClient = class WebSocketClient {
 				if (handler) {
 					this.batchHandlers.delete(errorMsg.requestId);
 					clearTimeout(handler.timeout);
-					handler.reject(/* @__PURE__ */ new Error(`${errorMsg.code}: ${errorMsg.error}`));
+					handler.reject(new Error(formatServerErrorMessage(errorMsg.code, errorMsg.error)));
 				}
 				break;
 			}
@@ -6088,7 +6141,7 @@ var WebSocketClient = class WebSocketClient {
 						if (variant.status === "completed") batchHandler.completed.push(variant);
 						else batchHandler.failed.push({
 							variantId: variant.id,
-							error: variant.error_message || "Generation failed"
+							error: formatGenerationFailureMessage(variant.error_message, variant.provider_metadata)
 						});
 						if (batchHandler.pending.size === 0) {
 							this.batchHandlers.delete(batchRequestId);
@@ -6116,7 +6169,7 @@ var WebSocketClient = class WebSocketClient {
 							jobId: variant.id,
 							success: variant.status === "completed",
 							variant: variant.status === "completed" ? variant : void 0,
-							error: variant.status === "failed" ? variant.error_message || "Generation failed" : void 0
+							error: variant.status === "failed" ? formatGenerationFailureMessage(variant.error_message, variant.provider_metadata) : void 0
 						};
 						handler.onResult(result);
 					}
@@ -6167,7 +6220,7 @@ var WebSocketClient = class WebSocketClient {
 				const mutationConsumed = this.failMutationWaiters(error);
 				const estimateConsumed = this.failEstimateHandlers(error);
 				if (!(mutationConsumed || estimateConsumed)) {
-					console.error(`[WebSocketClient] Server error: ${errorMsg.code} - ${errorMsg.message}`);
+					console.error(`Server error: ${formatServerErrorMessage(errorMsg.code, errorMsg.message)}`);
 					this.onError?.(new Error(errorMsg.message));
 				}
 				break;
@@ -6719,6 +6772,8 @@ var VIDEO_GENERATION_TIERS = [
 	"fast",
 	"lite"
 ];
+var VIDEO_MODEL_SELECTIONS = ["veo-3.1", "omni-flash"];
+var GEMINI_OMNI_FLASH_VIDEO_MODEL = "gemini-omni-flash-preview";
 var VIDEO_GENERATION_AUDIO_TOGGLE_MODELS = [];
 var VIDEO_GENERATION_RESOLUTIONS_BY_TIER = {
 	generate: VIDEO_GENERATION_RESOLUTIONS,
@@ -6726,6 +6781,7 @@ var VIDEO_GENERATION_RESOLUTIONS_BY_TIER = {
 	lite: ["720p", "1080p"]
 };
 var DEFAULT_VIDEO_GENERATION_TIER = "generate";
+var DEFAULT_VIDEO_MODEL_SELECTION = "veo-3.1";
 function normalizeVideoGenerationAspectRatio(value) {
 	return VIDEO_GENERATION_ASPECT_RATIOS.includes(value) ? value : void 0;
 }
@@ -6744,24 +6800,43 @@ function normalizeVideoGenerationDurationSeconds(value) {
 function normalizeVideoGenerationTier(value) {
 	return VIDEO_GENERATION_TIERS.includes(value) ? value : void 0;
 }
+function normalizeVideoModelSelection(value) {
+	return VIDEO_MODEL_SELECTIONS.includes(value) ? value : void 0;
+}
 function getVideoGenerationModelForTier(tier = DEFAULT_VIDEO_GENERATION_TIER) {
 	return VIDEO_GENERATION_TIER_MODELS[tier];
 }
+function getVideoGenerationModelForSelection(selection = DEFAULT_VIDEO_MODEL_SELECTION, tier = DEFAULT_VIDEO_GENERATION_TIER) {
+	return selection === "omni-flash" ? GEMINI_OMNI_FLASH_VIDEO_MODEL : getVideoGenerationModelForTier(tier);
+}
 function getVideoGenerationResolutionsForTier(tier = DEFAULT_VIDEO_GENERATION_TIER) {
 	return VIDEO_GENERATION_RESOLUTIONS_BY_TIER[tier];
 }
 function isVideoGenerationResolutionSupportedForTier(resolution, tier = DEFAULT_VIDEO_GENERATION_TIER) {
 	return VIDEO_GENERATION_RESOLUTIONS_BY_TIER[tier].includes(resolution);
 }
+function getVideoGenerationTierForModel(model) {
+	if (typeof model !== "string") return void 0;
+	return VIDEO_GENERATION_TIERS.find((tier) => VIDEO_GENERATION_TIER_MODELS[tier] === model);
+}
+function isVeoVideoGenerationModel(model) {
+	return typeof model === "string" && getVideoGenerationTierForModel(model) !== void 0;
+}
+function isGeminiOmniVideoGenerationModel(model) {
+	return model === GEMINI_OMNI_FLASH_VIDEO_MODEL;
+}
+function isVideoGenerationModel(model) {
+	return isVeoVideoGenerationModel(model) || isGeminiOmniVideoGenerationModel(model);
+}
 function doesVideoGenerationModelSupportAudioToggle(model) {
-	return VIDEO_GENERATION_AUDIO_TOGGLE_MODELS.includes(model);
+	return isVeoVideoGenerationModel(model) && VIDEO_GENERATION_AUDIO_TOGGLE_MODELS.includes(model);
 }
 //#endregion
 //#region src/shared/imageGenerationOptions.ts
 var IMAGE_MODEL_SELECTIONS = ["pro", "flash"];
 var IMAGE_MODEL_IDS = {
-	pro: "gemini-3-pro-image-preview",
-	flash: "gemini-2.5-flash-image"
+	pro: "gemini-3-pro-image",
+	flash: "gemini-3.1-flash-image"
 };
 IMAGE_MODEL_IDS["pro"];
 var IMAGE_ASPECT_RATIOS = [
@@ -6796,8 +6871,12 @@ var IMAGE_MODEL_CAPABILITIES = {
 	flash: {
 		selection: "flash",
 		modelId: IMAGE_MODEL_IDS.flash,
-		maxReferenceImages: 1,
-		supportedImageSizes: ["1K"],
+		maxReferenceImages: 14,
+		supportedImageSizes: [
+			"1K",
+			"2K",
+			"4K"
+		],
 		supportedAspectRatios: IMAGE_ASPECT_RATIOS
 	}
 };
@@ -7068,10 +7147,15 @@ async function handleForgeCommand(command, parsed) {
 		await executeForgeCommand(command, parsed, defaultDeps$7);
 	} catch (error) {
 		console.error("Error:", error instanceof Error ? error.message : error);
-		printUsage$7(command);
+		if (shouldPrintUsageForForgeError(error)) printUsage$7(command);
 		process$1.exitCode = 1;
 	}
 }
+function shouldPrintUsageForForgeError(error) {
+	if (!(error instanceof Error)) return false;
+	const message = error.message;
+	return message.startsWith("--") || message.startsWith("Output path is required") || message.startsWith("Output directory is required") || message.startsWith("Pass either prompt text") || message.startsWith("Speech generation requires") || message.startsWith("Dialogue generation requires") || message.startsWith("Prompt is required");
+}
 async function executeForgeCommand(command, parsed, deps = defaultDeps$7, options = {}) {
 	const mediaKind = options.mediaKind || CLI_GENERATION_MEDIA_KIND;
 	if (parsed.options.follow) {
@@ -7168,7 +7252,7 @@ async function executeGenerate(parsed, ctx, client, deps, mediaKind, followOptio
 		mediaKind,
 		prompt,
 		count: 1,
-		model: imageOptions.model ?? audioModelOptions.model,
+		model: imageOptions.model ?? audioModelOptions.model ?? videoOptions.model,
 		imageSize: imageOptions.imageSize,
 		...musicProvider ? { musicProvider } : {},
 		...videoAudioOptions,
@@ -7263,7 +7347,7 @@ async function executeRefine(parsed, ctx, client, deps, mediaKind) {
 		mediaKind,
 		prompt,
 		count: 1,
-		model: imageOptions.model,
+		model: imageOptions.model ?? videoOptions.model,
 		imageSize: imageOptions.imageSize,
 		...videoAudioOptions,
 		...videoOptions
@@ -7334,7 +7418,7 @@ async function executeDerive(parsed, ctx, client, deps, mediaKind, followOptions
 		mediaKind,
 		prompt,
 		count: 1,
-		model: imageOptions.model,
+		model: imageOptions.model ?? videoOptions.model,
 		imageSize: imageOptions.imageSize,
 		...videoAudioOptions,
 		...videoOptions
@@ -7497,7 +7581,7 @@ function resultFromTerminalVariant(variant, requestId) {
 		requestId,
 		jobId: variant.id,
 		success: false,
-		error: variant.error_message || "Generation failed"
+		error: formatGenerationFailureMessage(variant.error_message, variant.provider_metadata)
 	};
 }
 function parseGenerationRecipe(recipeJson) {
@@ -7942,11 +8026,13 @@ function validateVideoAudioOptions(parsed, mediaKind) {
 	if (!(parsed.options.audio !== void 0 || parsed.options["no-audio"] !== void 0 || parsed.options.noAudio !== void 0)) return;
 	if (mediaKind !== "video") throw new Error("--audio and --no-audio are only supported for video generation");
 	if (parsed.options.audio !== void 0 && (parsed.options["no-audio"] !== void 0 || parsed.options.noAudio !== void 0)) throw new Error("Pass either --audio or --no-audio, not both");
+	const tierValue = readOptionalOption(parsed, "tier", "tier") ?? readOptionalOption(parsed, "video-tier", "videoTier");
+	const modelValue = readOptionalOption(parsed, "model", "model");
+	const videoTier = tierValue === void 0 ? DEFAULT_VIDEO_GENERATION_TIER : normalizeVideoGenerationTier(tierValue);
+	if (!videoTier) throw new Error("--tier must be generate, fast, or lite");
+	const model = parseVideoModelOption(modelValue, videoTier);
+	if (parsed.options.audio !== void 0 && isGeminiOmniVideoGenerationModel(model)) throw new Error("--audio is only supported with --model veo-3.1");
 	if (parsed.options["no-audio"] !== void 0 || parsed.options.noAudio !== void 0) {
-		const tierValue = readOptionalOption(parsed, "tier", "tier") ?? readOptionalOption(parsed, "video-tier", "videoTier");
-		const videoTier = tierValue === void 0 ? DEFAULT_VIDEO_GENERATION_TIER : normalizeVideoGenerationTier(tierValue);
-		if (!videoTier) throw new Error("--tier must be generate, fast, or lite");
-		const model = getVideoGenerationModelForTier(videoTier);
 		if (!doesVideoGenerationModelSupportAudioToggle(model)) throw new Error(`${model} does not support --no-audio. Use the default audio-enabled output or omit the flag.`);
 	}
 }
@@ -7961,8 +8047,9 @@ function parseVideoGenerationOptions(parsed, mediaKind) {
 	const resolutionValue = readOptionalOption(parsed, "resolution", "resolution") ?? readOptionalOption(parsed, "video-resolution", "videoResolution");
 	const durationValue = readOptionalOption(parsed, "duration", "duration") ?? readOptionalOption(parsed, "video-duration", "videoDuration");
 	const tierValue = readOptionalOption(parsed, "tier", "tier") ?? readOptionalOption(parsed, "video-tier", "videoTier");
+	const modelValue = mediaKind === "video" ? readOptionalOption(parsed, "model", "model") : void 0;
 	const aspectValue = mediaKind === "video" ? readOptionalOption(parsed, "aspect", "aspect") : void 0;
-	if (resolutionValue === void 0 && durationValue === void 0 && tierValue === void 0 && aspectValue === void 0) return {};
+	if (mediaKind !== "video" && resolutionValue === void 0 && durationValue === void 0 && tierValue === void 0 && aspectValue === void 0) return {};
 	if (mediaKind !== "video") throw new Error("--resolution, --duration, and --tier are only supported for video generation");
 	const videoResolution = resolutionValue === void 0 ? void 0 : normalizeVideoGenerationResolution(resolutionValue);
 	if (resolutionValue !== void 0 && !videoResolution) throw new Error("--resolution must be 720p, 1080p, or 4k");
@@ -7970,10 +8057,13 @@ function parseVideoGenerationOptions(parsed, mediaKind) {
 	if (durationValue !== void 0 && !videoDurationSeconds) throw new Error("--duration must be 4, 6, or 8");
 	const videoTier = tierValue === void 0 ? void 0 : normalizeVideoGenerationTier(tierValue);
 	if (tierValue !== void 0 && !videoTier) throw new Error("--tier must be generate, fast, or lite");
+	const model = parseVideoModelOption(modelValue, videoTier);
+	if (isGeminiOmniVideoGenerationModel(model) && (resolutionValue !== void 0 || durationValue !== void 0 || tierValue !== void 0)) throw new Error("--resolution, --duration, and --tier are only supported with --model veo-3.1");
 	if (videoResolution && videoTier && !isVideoGenerationResolutionSupportedForTier(videoResolution, videoTier)) throw new Error("--resolution 4k is not supported with --tier lite");
 	const aspectRatio = aspectValue === void 0 ? void 0 : normalizeVideoGenerationAspectRatio(aspectValue);
 	if (aspectValue !== void 0 && !aspectRatio) throw new Error("--aspect must be 16:9 or 9:16");
 	return {
+		model,
 		...aspectRatio ? { aspectRatio } : {},
 		...videoResolution ? { videoResolution } : {},
 		...videoDurationSeconds ? { videoDurationSeconds } : {},
@@ -7994,6 +8084,9 @@ function validateVideoFrameReferenceOptions(command, parsed, mediaKind) {
 	if (command !== "generate" && command !== "derive") throw new Error("--first-frame and --last-frame are only supported for video generate and video derive");
 	if (lastFrame && !firstFrame) throw new Error("--last-frame requires --first-frame");
 	if (parsed.options.refs) throw new Error("--first-frame and --last-frame cannot be combined with --refs");
+	const tierValue = readOptionalOption(parsed, "tier", "tier") ?? readOptionalOption(parsed, "video-tier", "videoTier");
+	const videoTier = tierValue === void 0 ? void 0 : normalizeVideoGenerationTier(tierValue);
+	if (isGeminiOmniVideoGenerationModel(parseVideoModelOption(readOptionalOption(parsed, "model", "model"), videoTier))) throw new Error("--first-frame and --last-frame are only supported with --model veo-3.1");
 }
 function readVideoFrameOption(parsed, kebabName, camelName) {
 	const value = parsed.options[kebabName] ?? parsed.options[camelName];
@@ -8039,6 +8132,19 @@ function parseImageGenerationOptions(parsed, mediaKind) {
 		...aspectRatio ? { aspectRatio } : {}
 	};
 }
+function parseVideoModelOption(value, tier) {
+	const normalized = normalizeCliOption(value);
+	const effectiveTier = tier ?? "generate";
+	if (!normalized) return getVideoGenerationModelForSelection(DEFAULT_VIDEO_MODEL_SELECTION, effectiveTier);
+	const selection = normalizeVideoModelSelection(normalized);
+	if (selection) return getVideoGenerationModelForSelection(selection, effectiveTier);
+	if (isVideoGenerationModel(normalized)) {
+		const modelTier = normalizeVideoGenerationTier(tier) ?? void 0;
+		if (modelTier && getVideoGenerationModelForTier(modelTier) !== normalized && !isGeminiOmniVideoGenerationModel(normalized)) throw new Error("--model and --tier select different Veo models");
+		return normalized;
+	}
+	throw new Error("--model must be veo-3.1, omni-flash, or an exact video model ID");
+}
 function parseImageModelOption(value) {
 	if (!value) return void 0;
 	if (isImageModelSelection(value)) return value;
@@ -8287,22 +8393,24 @@ function printUsage$5() {
 	const resolutionValues = Array.from(new Set(VIDEO_GENERATION_TIERS.flatMap((tier) => getVideoGenerationResolutionsForTier(tier)))).join("|");
 	const durationValues = VIDEO_GENERATION_DURATION_SECONDS.join("|");
 	const tierValues = VIDEO_GENERATION_TIERS.join("|");
+	const modelValues = VIDEO_MODEL_SELECTIONS.join("|");
 	const resolutionByTier = VIDEO_GENERATION_TIERS.map((tier) => `${tier}: ${getVideoGenerationResolutionsForTier(tier).join(", ")}`).join("; ");
 	console.log(`
 Usage:
-  makefx video generate "prompt" --name <name> --type <type> -o <file> [--first-frame <variant_or_file>] [--last-frame <variant_or_file>] [--aspect ${aspectValues}] [--resolution ${resolutionValues}] [--duration ${durationValues}] [--tier ${tierValues}] [--audio] [--space <id>]
+  makefx video generate "prompt" --name <name> --type <type> -o <file> [--model ${modelValues}] [--first-frame <variant_or_file>] [--last-frame <variant_or_file>] [--aspect ${aspectValues}] [--resolution ${resolutionValues}] [--duration ${durationValues}] [--tier ${tierValues}] [--audio] [--space <id>]
   makefx video generate --follow <variant_id> -o <file> [--space <id>]
-  makefx video refine --variant <variant_id> "prompt" -o <file> [--aspect ${aspectValues}] [--resolution ${resolutionValues}] [--duration ${durationValues}] [--tier ${tierValues}] [--audio] [--space <id>]
+  makefx video refine --variant <variant_id> "prompt" -o <file> [--model ${modelValues}] [--aspect ${aspectValues}] [--resolution ${resolutionValues}] [--duration ${durationValues}] [--tier ${tierValues}] [--audio] [--space <id>]
   makefx video refine --follow <variant_id> -o <file> [--space <id>]
-  makefx video derive --refs <variant_or_file,variant_or_file> --name <name> --type <type> "prompt" -o <file> [--aspect ${aspectValues}] [--resolution ${resolutionValues}] [--duration ${durationValues}] [--tier ${tierValues}] [--audio] [--space <id>]
-  makefx video derive --first-frame <variant_or_file> [--last-frame <variant_or_file>] --name <name> --type <type> "prompt" -o <file> [--aspect ${aspectValues}] [--resolution ${resolutionValues}] [--duration ${durationValues}] [--tier ${tierValues}] [--audio] [--space <id>]
+  makefx video derive --refs <variant_or_file,variant_or_file> --name <name> --type <type> "prompt" -o <file> [--model ${modelValues}] [--aspect ${aspectValues}] [--resolution ${resolutionValues}] [--duration ${durationValues}] [--tier ${tierValues}] [--audio] [--space <id>]
+  makefx video derive --first-frame <variant_or_file> [--last-frame <variant_or_file>] --name <name> --type <type> "prompt" -o <file> [--model veo-3.1] [--aspect ${aspectValues}] [--resolution ${resolutionValues}] [--duration ${durationValues}] [--tier ${tierValues}] [--audio] [--space <id>]
   makefx video derive --follow <variant_id> -o <file> [--space <id>]
 
 Video:
-  --aspect <ratio>      Veo aspect ratio: ${aspectValues}
-  --resolution <value>  Veo output resolution (${resolutionByTier})
-  --duration <seconds>  Veo output duration: ${durationValues}
-  --tier <tier>         Veo model tier: ${tierValues}
+  --model <value>       Video model: ${modelValues}
+  --aspect <ratio>      Video aspect ratio: ${aspectValues}
+  --resolution <value>  Veo-only output resolution (${resolutionByTier})
+  --duration <seconds>  Veo-only output duration: ${durationValues}
+  --tier <tier>         Veo-only model tier: ${tierValues}
   --first-frame <ref>   Veo start frame image variant or local image path
   --last-frame <ref>    Veo final frame image variant or local image path
 
@@ -9256,7 +9364,7 @@ Options:
 }
 //#endregion
 //#region src/cli/index.ts
-var CLI_VERSION = "1.0.1+b273381daffd";
+var CLI_VERSION = "1.0.3+9dc1e273aed1";
 async function main() {
 	const argv = process$1.argv.slice(2);
 	if (argv[0] === "--") argv.shift();
@@ -9321,13 +9429,17 @@ function videoDurationValues() {
 function videoTierValues() {
 	return optionValues(VIDEO_GENERATION_TIERS);
 }
+function videoModelValues() {
+	return optionValues(VIDEO_MODEL_SELECTIONS);
+}
 function videoCapabilityHelp() {
 	const resolutionLines = VIDEO_GENERATION_TIERS.map((tier) => `${tier}: ${getVideoGenerationResolutionsForTier(tier).join(", ")}`).join("; ");
 	return `Video:
-  --aspect <ratio>      Veo aspect ratio: ${videoAspectValues()}
-  --resolution <value>  Veo output resolution (${resolutionLines})
-  --duration <seconds>  Veo output duration: ${videoDurationValues()}
-  --tier <tier>         Veo model tier: ${videoTierValues()}
+  --model <value>       Video model: ${videoModelValues()}
+  --aspect <ratio>      Video aspect ratio: ${videoAspectValues()}
+  --resolution <value>  Veo-only output resolution (${resolutionLines})
+  --duration <seconds>  Veo-only output duration: ${videoDurationValues()}
+  --tier <tier>         Veo-only model tier: ${videoTierValues()}
   --first-frame <ref>   Veo start frame image variant or local image path
   --last-frame <ref>    Veo final frame image variant or local image path
   --follow <id>         Resume/download a variant after a long generation or disconnect
@@ -9727,7 +9839,7 @@ function printVideoHelp(positionals) {
 	if (subcommand === "generate") {
 		console.log(`
 Usage:
-  makefx video generate "prompt" --name <name> --type <type> -o <file> [--first-frame <variant_or_file>] [--last-frame <variant_or_file>] [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--space <id>]
+  makefx video generate "prompt" --name <name> --type <type> -o <file> [--model ${videoModelValues()}] [--first-frame <variant_or_file>] [--last-frame <variant_or_file>] [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--space <id>]
   makefx video generate --follow <variant_id> -o <file> [--space <id>]
 
 ${videoCapabilityHelp()}
@@ -9743,7 +9855,7 @@ Long runs:
 	if (subcommand === "refine") {
 		console.log(`
 Usage:
-  makefx video refine --variant <variant_id> "prompt" -o <file> [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--space <id>]
+  makefx video refine --variant <variant_id> "prompt" -o <file> [--model ${videoModelValues()}] [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--space <id>]
   makefx video refine --follow <variant_id> -o <file> [--space <id>]
 
 ${videoCapabilityHelp()}
@@ -9759,8 +9871,8 @@ Long runs:
 	if (subcommand === "derive") {
 		console.log(`
 Usage:
-  makefx video derive --refs <variant_or_file,variant_or_file> --name <name> --type <type> "prompt" -o <file> [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--space <id>]
-  makefx video derive --first-frame <variant_or_file> [--last-frame <variant_or_file>] --name <name> --type <type> "prompt" -o <file> [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--space <id>]
+  makefx video derive --refs <variant_or_file,variant_or_file> --name <name> --type <type> "prompt" -o <file> [--model ${videoModelValues()}] [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--space <id>]
+  makefx video derive --first-frame <variant_or_file> [--last-frame <variant_or_file>] --name <name> --type <type> "prompt" -o <file> [--model veo-3.1] [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--space <id>]
   makefx video derive --follow <variant_id> -o <file> [--space <id>]
 
 ${videoCapabilityHelp()}
@@ -9775,11 +9887,11 @@ Long runs:
 	}
 	console.log(`
 Usage:
-  makefx video generate "prompt" --name <name> --type <type> -o <file> [--first-frame <variant_or_file>] [--last-frame <variant_or_file>] [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--space <id>]
+  makefx video generate "prompt" --name <name> --type <type> -o <file> [--model ${videoModelValues()}] [--first-frame <variant_or_file>] [--last-frame <variant_or_file>] [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--space <id>]
   makefx video generate --follow <variant_id> -o <file> [--space <id>]
-  makefx video refine --variant <variant_id> "prompt" -o <file> [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--space <id>]
-  makefx video derive --refs <variant_or_file,variant_or_file> --name <name> --type <type> "prompt" -o <file> [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--space <id>]
-  makefx video derive --first-frame <variant_or_file> [--last-frame <variant_or_file>] --name <name> --type <type> "prompt" -o <file> [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--space <id>]
+  makefx video refine --variant <variant_id> "prompt" -o <file> [--model ${videoModelValues()}] [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--space <id>]
+  makefx video derive --refs <variant_or_file,variant_or_file> --name <name> --type <type> "prompt" -o <file> [--model ${videoModelValues()}] [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--space <id>]
+  makefx video derive --first-frame <variant_or_file> [--last-frame <variant_or_file>] --name <name> --type <type> "prompt" -o <file> [--model veo-3.1] [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--space <id>]
 
 ${videoCapabilityHelp()}
 
@@ -9830,6 +9942,9 @@ Usage:
   makefx assets show <asset-id>
   makefx assets show <asset-id> --json
   makefx assets download <variant-id|legacy-image-key> -o output-file
+  makefx assets delete <asset-id>
+  makefx assets rename <asset-id> "<new-name>"
+  makefx assets set-active <asset-id> <variant-id>
 `);
 }
 function printUsageHelp() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "makefx",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Command-line interface for AI-assisted game asset production with Make Effects.",
   "license": "MIT",
   "type": "module",