makefx 1.1.0 → 1.2.0

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.1.0
+Version: 1.2.0

package/makefx.mjs

@@ -5916,6 +5916,9 @@ var ServerConfirmationTimeoutError = class extends Error {
 		this.name = "ServerConfirmationTimeoutError";
 	}
 };
+function booleanFromSqlite(value) {
+	return value === true || value === 1;
+}
 function collectionItemMatchesInput(item, input) {
 	if (item.subject_type !== input.subjectType) return false;
 	if (input.subjectType === "asset" && item.asset_id !== input.assetId) return false;
@@ -5935,7 +5938,6 @@ var WebSocketClient = class WebSocketClient {
 	chatHandlers = /* @__PURE__ */ new Map();
 	generateHandlers = /* @__PURE__ */ new Map();
 	batchHandlers = /* @__PURE__ */ new Map();
-	estimateHandlers = /* @__PURE__ */ new Map();
 	batchVariantToRequestId = /* @__PURE__ */ new Map();
 	variantCompletionHandlers = /* @__PURE__ */ new Map();
 	describeHandlers = /* @__PURE__ */ new Map();
@@ -6131,16 +6133,6 @@ var WebSocketClient = class WebSocketClient {
 				}
 				break;
 			}
-			case "generation:estimate": {
-				const estimateMsg = message;
-				const handler = this.estimateHandlers.get(estimateMsg.requestId);
-				if (handler) {
-					this.estimateHandlers.delete(estimateMsg.requestId);
-					clearTimeout(handler.timeout);
-					handler.resolve(estimateMsg);
-				}
-				break;
-			}
 			case "variant:updated": {
 				const variant = message.variant;
 				const batchRequestId = this.batchVariantToRequestId.get(variant.id);
@@ -6296,13 +6288,6 @@ var WebSocketClient = class WebSocketClient {
 		return true;
 	}
 	failRequestHandler(requestId, error) {
-		const estimateHandler = this.estimateHandlers.get(requestId);
-		if (estimateHandler) {
-			this.estimateHandlers.delete(requestId);
-			clearTimeout(estimateHandler.timeout);
-			estimateHandler.reject(error);
-			return true;
-		}
 		const generateHandler = this.generateHandlers.get(requestId);
 		if (generateHandler) {
 			this.generateHandlers.delete(requestId);
@@ -6395,11 +6380,15 @@ var WebSocketClient = class WebSocketClient {
 	}
 	/** Star or unstar a variant. Resolves with the updated variant. */
 	async starVariant(variantId, starred) {
-		return (await this.awaitServerMessage({
+		const result = await this.awaitServerMessage({
 			type: "variant:star",
 			variantId,
 			starred
-		}, (msg) => msg.type === "variant:updated" && msg.variant.id === variantId && msg.variant.starred === starred)).variant;
+		}, (msg) => msg.type === "variant:updated" && msg.variant.id === variantId && booleanFromSqlite(msg.variant.starred) === starred);
+		return {
+			...result.variant,
+			starred: booleanFromSqlite(result.variant.starred)
+		};
 	}
 	/** Rate a variant (approved/rejected). Resolves with the updated variant. */
 	async rateVariant(variantId, rating) {
@@ -6484,47 +6473,6 @@ var WebSocketClient = class WebSocketClient {
 			}, 12e4);
 		});
 	}
-	async sendGenerationEstimateRequest(params) {
-		const requestId = crypto.randomUUID();
-		return new Promise((resolve, reject) => {
-			const timeout = setTimeout(() => {
-				if (this.estimateHandlers.has(requestId)) {
-					this.estimateHandlers.delete(requestId);
-					reject(/* @__PURE__ */ new Error("Generation estimate request timed out"));
-				}
-			}, 3e4);
-			this.estimateHandlers.set(requestId, {
-				resolve,
-				reject,
-				timeout
-			});
-			const message = {
-				type: "generation:estimate",
-				requestId,
-				operation: params.operation,
-				assetId: params.assetId,
-				assetType: params.assetType,
-				mediaKind: params.mediaKind,
-				prompt: params.prompt,
-				count: params.count,
-				model: params.model,
-				aspectRatio: params.aspectRatio,
-				imageSize: params.imageSize,
-				musicProvider: params.musicProvider,
-				generateAudio: params.generateAudio,
-				videoResolution: params.videoResolution,
-				videoDurationSeconds: params.videoDurationSeconds,
-				videoTier: params.videoTier
-			};
-			try {
-				this.send(message);
-			} catch (err) {
-				this.estimateHandlers.delete(requestId);
-				clearTimeout(timeout);
-				reject(err);
-			}
-		});
-	}
 	/**
 	* Send a generate request and wait for result
 	*/
@@ -6832,12 +6780,27 @@ var VIDEO_GENERATION_RESOLUTIONS = [
 	"1080p",
 	"4k"
 ];
+var ALL_VIDEO_GENERATION_RESOLUTIONS = ["480p", ...VIDEO_GENERATION_RESOLUTIONS];
 var KLING_VIDEO_GENERATION_RESOLUTIONS = ["720p", "1080p"];
 var VIDEO_GENERATION_DURATION_SECONDS = [
 	4,
 	6,
 	8
 ];
+var SEEDANCE_2_DURATION_SECONDS = [
+	4,
+	5,
+	6,
+	7,
+	8,
+	9,
+	10,
+	11,
+	12,
+	13,
+	14,
+	15
+];
 var VIDEO_GENERATION_TIERS = [
 	"generate",
 	"fast",
@@ -6847,7 +6810,9 @@ var VIDEO_MODEL_SELECTIONS = [
 	"veo-3.1",
 	"omni-flash",
 	"kling",
-	"fal-seedance"
+	"fal-seedance",
+	"seedance-2",
+	"seedance-2-fast"
 ];
 var VIDEO_MODEL_SUPPORTED_OPERATIONS = {
 	"veo-3.1": [
@@ -6865,10 +6830,14 @@ var VIDEO_MODEL_SUPPORTED_OPERATIONS = {
 		"refine",
 		"derive"
 	],
-	"fal-seedance": ["generate"]
+	"fal-seedance": ["generate"],
+	"seedance-2": ["generate", "derive"],
+	"seedance-2-fast": ["generate", "derive"]
 };
 var KLING_VIDEO_MODEL = "kling-v3";
 var FAL_VIDEO_MODEL = "fal-ai/bytedance/seedance/v1/pro/text-to-video";
+var FAL_SEEDANCE_2_MODEL = "bytedance/seedance-2.0/image-to-video";
+var FAL_SEEDANCE_2_FAST_MODEL = "bytedance/seedance-2.0/fast/image-to-video";
 var GEMINI_OMNI_FLASH_VIDEO_MODEL = "gemini-omni-flash-preview";
 var VIDEO_GENERATION_AUDIO_TOGGLE_MODELS = [];
 var VIDEO_GENERATION_RESOLUTIONS_BY_TIER = {
@@ -6887,11 +6856,11 @@ var VIDEO_GENERATION_TIER_MODELS = {
 	lite: "veo-3.1-lite-generate-preview"
 };
 function normalizeVideoGenerationResolution(value) {
-	return VIDEO_GENERATION_RESOLUTIONS.includes(value) ? value : void 0;
+	return ALL_VIDEO_GENERATION_RESOLUTIONS.includes(value) ? value : void 0;
 }
 function normalizeVideoGenerationDurationSeconds(value) {
 	const numeric = typeof value === "string" ? Number(value) : value;
-	return VIDEO_GENERATION_DURATION_SECONDS.includes(numeric) ? numeric : void 0;
+	return SEEDANCE_2_DURATION_SECONDS.includes(numeric) ? numeric : void 0;
 }
 function normalizeVideoGenerationTier(value) {
 	return VIDEO_GENERATION_TIERS.includes(value) ? value : void 0;
@@ -6906,6 +6875,8 @@ function getVideoGenerationModelForSelection(selection = DEFAULT_VIDEO_MODEL_SEL
 	if (selection === "omni-flash") return GEMINI_OMNI_FLASH_VIDEO_MODEL;
 	if (selection === "kling") return KLING_VIDEO_MODEL;
 	if (selection === "fal-seedance") return FAL_VIDEO_MODEL;
+	if (selection === "seedance-2") return FAL_SEEDANCE_2_MODEL;
+	if (selection === "seedance-2-fast") return FAL_SEEDANCE_2_FAST_MODEL;
 	return getVideoGenerationModelForTier(tier);
 }
 function getVideoGenerationResolutionsForTier(tier = DEFAULT_VIDEO_GENERATION_TIER) {
@@ -6915,7 +6886,14 @@ function isVideoGenerationResolutionSupportedForTier(resolution, tier = DEFAULT_
 	return VIDEO_GENERATION_RESOLUTIONS_BY_TIER[tier].includes(resolution);
 }
 function getVideoGenerationResolutionsForModel(model) {
-	return isKlingVideoGenerationModel(model) || isFalVideoGenerationModel(model) ? KLING_VIDEO_GENERATION_RESOLUTIONS : getVideoGenerationResolutionsForTier(getVideoGenerationTierForModel(model));
+	if (isKlingVideoGenerationModel(model) || isFalSeedanceV1VideoGenerationModel(model)) return KLING_VIDEO_GENERATION_RESOLUTIONS;
+	if (model === "bytedance/seedance-2.0/fast/image-to-video") return ["480p", "720p"];
+	if (isFalSeedance2VideoGenerationModel(model)) return [
+		"480p",
+		"720p",
+		"1080p"
+	];
+	return getVideoGenerationResolutionsForTier(getVideoGenerationTierForModel(model));
 }
 function isVideoGenerationResolutionSupportedForModel(model, resolution) {
 	return getVideoGenerationResolutionsForModel(model).includes(resolution);
@@ -6928,6 +6906,8 @@ function getVideoModelSelectionForModel(model) {
 	if (model === "gemini-omni-flash-preview") return "omni-flash";
 	if (model === "kling-v3") return "kling";
 	if (model === "fal-ai/bytedance/seedance/v1/pro/text-to-video") return "fal-seedance";
+	if (model === "bytedance/seedance-2.0/image-to-video") return "seedance-2";
+	if (model === "bytedance/seedance-2.0/fast/image-to-video") return "seedance-2-fast";
 	return getVideoGenerationTierForModel(model) ? "veo-3.1" : void 0;
 }
 function isVeoVideoGenerationModel(model) {
@@ -6940,8 +6920,14 @@ function isKlingVideoGenerationModel(model) {
 	return model === KLING_VIDEO_MODEL;
 }
 function isFalVideoGenerationModel(model) {
+	return isFalSeedanceV1VideoGenerationModel(model) || isFalSeedance2VideoGenerationModel(model);
+}
+function isFalSeedanceV1VideoGenerationModel(model) {
 	return model === FAL_VIDEO_MODEL;
 }
+function isFalSeedance2VideoGenerationModel(model) {
+	return model === "bytedance/seedance-2.0/image-to-video" || model === "bytedance/seedance-2.0/fast/image-to-video";
+}
 function isVideoGenerationModel(model) {
 	return isVeoVideoGenerationModel(model) || isGeminiOmniVideoGenerationModel(model) || isKlingVideoGenerationModel(model) || isFalVideoGenerationModel(model);
 }
@@ -7022,7 +7008,7 @@ var IMAGE_MODEL_CAPABILITIES = {
 	flux: {
 		selection: "flux",
 		modelId: IMAGE_MODEL_IDS.flux,
-		label: "FLUX.1 Dev",
+		label: "fal.ai FLUX.1 Dev",
 		provider: "fal",
 		supportedOperations: ["generate"],
 		maxReferenceImages: 0,
@@ -7248,43 +7234,6 @@ var defaultDeps$9 = {
 		}
 	}
 };
-var ESTIMATE_METER_LABELS = {
-	gemini_images: "Gemini image",
-	gemini_videos: "Veo video unit",
-	gemini_audio: "Lyria generation",
-	elevenlabs_audio: "ElevenLabs unit"
-};
-function formatEstimatedUsd(microUsd) {
-	if (!Number.isFinite(microUsd) || microUsd <= 0) return "$0.00";
-	if (microUsd < 1e4) return "<$0.01";
-	return `$${(microUsd / 1e6).toFixed(2)}`;
-}
-function formatEstimateQuantity(quantity, singular) {
-	const normalized = Number.isFinite(quantity) ? quantity : 0;
-	const suffix = normalized === 1 ? singular : `${singular}s`;
-	return `${normalized.toLocaleString()} ${suffix}`;
-}
-async function printPreflightEstimate(client, params) {
-	let result;
-	try {
-		result = await client.sendGenerationEstimateRequest(params);
-	} catch (error) {
-		console.warn(`Preflight estimate unavailable: ${error instanceof Error ? error.message : String(error)}`);
-		return;
-	}
-	if (!result.success || !result.estimate) {
-		console.warn(`Preflight estimate unavailable: ${result.error || "unknown error"}`);
-		return;
-	}
-	const estimate = result.estimate;
-	const meterLabel = ESTIMATE_METER_LABELS[estimate.meterEventName] ?? estimate.meterEventName;
-	const quotaLine = estimate.quota?.limit === null || estimate.quota?.limit === void 0 ? void 0 : `${estimate.quota.used.toLocaleString()} used / ${estimate.quota.limit.toLocaleString()} limit`;
-	console.log("Preflight estimate:");
-	console.log(`  Usage: ${formatEstimateQuantity(estimate.quotaQuantity, meterLabel)}, ${formatEstimateQuantity(estimate.platformWorkflowRuns, "workflow")}`);
-	console.log(`  Estimated provider cost: ${formatEstimatedUsd(estimate.providerCostMicroUsd)}${estimate.billingMode === "byok" ? " (BYOK)" : ""}`);
-	if (quotaLine) console.log(`  Quota: ${quotaLine}`);
-	if (!estimate.allowed) throw new Error(estimate.denyMessage || "Preflight check denied this generation request");
-}
 async function handleGenerate(parsed) {
 	await handleForgeCommand("generate", parsed);
 }
@@ -7405,25 +7354,12 @@ async function executeGenerate(parsed, ctx, client, deps, mediaKind, followOptio
 	const videoOptions = parseVideoGenerationOptions(parsed, mediaKind);
 	const effectiveVideoModel = videoOptions.model ?? getVideoGenerationModelForSelection();
 	if (mediaKind === "video" && isKlingVideoGenerationModel(effectiveVideoModel) && videoFrameRefs.length > 1) throw new Error("--model kling supports at most one image reference");
-	if (mediaKind === "video" && isFalVideoGenerationModel(effectiveVideoModel) && videoFrameRefs.length > 0) throw new Error(`--model ${getVideoModelSelectionForModel(effectiveVideoModel) ?? effectiveVideoModel} does not support image references`);
+	if (mediaKind === "video" && isFalVideoGenerationModel(effectiveVideoModel) && !isFalSeedance2VideoGenerationModel(effectiveVideoModel) && videoFrameRefs.length > 0) throw new Error(`--model ${getVideoModelSelectionForModel(effectiveVideoModel) ?? effectiveVideoModel} does not support image references`);
 	const collectionPlacement = parseCollectionPlacementOptions(parsed);
 	const followCommandOptions = {
 		...followOptions,
 		...collectionPlacement
 	};
-	await printPreflightEstimate(client, {
-		operation: "generate",
-		assetType,
-		mediaKind,
-		prompt,
-		count: 1,
-		model: imageOptions.model ?? audioModelOptions.model ?? videoOptions.model,
-		aspectRatio: imageOptions.aspectRatio ?? videoOptions.aspectRatio,
-		imageSize: imageOptions.imageSize,
-		...musicProvider ? { musicProvider } : {},
-		...videoAudioOptions,
-		...videoOptions
-	});
 	console.log(`Generating "${name}" in space ${ctx.spaceId}...`);
 	const audioVoiceOptions = mediaKind === "audio" ? parseAudioVoiceOptions(parsed) : {};
 	let startedVariantId;
@@ -7509,19 +7445,6 @@ async function executeRefine(parsed, ctx, client, deps, mediaKind) {
 	const videoOptions = parseVideoGenerationOptions(parsed, mediaKind);
 	const collectionPlacement = parseCollectionPlacementOptions(parsed);
 	const followCommandOptions = { ...collectionPlacement };
-	await printPreflightEstimate(client, {
-		operation: "refine",
-		assetId: sourceVariant.asset_id,
-		assetType: sourceAsset?.type || void 0,
-		mediaKind,
-		prompt,
-		count: 1,
-		model: imageOptions.model ?? videoOptions.model,
-		aspectRatio: imageOptions.aspectRatio ?? videoOptions.aspectRatio,
-		imageSize: imageOptions.imageSize,
-		...videoAudioOptions,
-		...videoOptions
-	});
 	console.log(`Refining variant ${sourceVariantId}...`);
 	let startedVariantId;
 	let result;
@@ -7586,24 +7509,12 @@ async function executeDerive(parsed, ctx, client, deps, mediaKind, followOptions
 	const videoOptions = parseVideoGenerationOptions(parsed, mediaKind);
 	const effectiveVideoModel = videoOptions.model ?? getVideoGenerationModelForSelection();
 	if (mediaKind === "video" && isKlingVideoGenerationModel(effectiveVideoModel) && referenceRefs.length > 1) throw new Error("--model kling supports at most one image reference");
-	if (mediaKind === "video" && isFalVideoGenerationModel(effectiveVideoModel) && referenceRefs.length > 0) throw new Error(`--model ${getVideoModelSelectionForModel(effectiveVideoModel) ?? effectiveVideoModel} does not support ${referenceRefs.length} image references`);
+	if (mediaKind === "video" && isFalVideoGenerationModel(effectiveVideoModel) && !isFalSeedance2VideoGenerationModel(effectiveVideoModel) && referenceRefs.length > 0) throw new Error(`--model ${getVideoModelSelectionForModel(effectiveVideoModel) ?? effectiveVideoModel} does not support ${referenceRefs.length} image references`);
 	const collectionPlacement = parseCollectionPlacementOptions(parsed);
 	const followCommandOptions = {
 		...followOptions,
 		...collectionPlacement
 	};
-	await printPreflightEstimate(client, {
-		operation: "derive",
-		assetType,
-		mediaKind,
-		prompt,
-		count: 1,
-		model: imageOptions.model ?? videoOptions.model,
-		aspectRatio: imageOptions.aspectRatio ?? videoOptions.aspectRatio,
-		imageSize: imageOptions.imageSize,
-		...videoAudioOptions,
-		...videoOptions
-	});
 	console.log(`Deriving "${name}" from ${referenceVariantIds.length} reference(s)...`);
 	let startedVariantId;
 	let result;
@@ -7816,17 +7727,6 @@ async function executeBatch(parsed, ctx, client, deps, mediaKind, saveBatchManif
 	const startedAt = (/* @__PURE__ */ new Date()).toISOString();
 	const runId = deps.createRunId();
 	const collectionPlacement = parseCollectionPlacementOptions(parsed);
-	await printPreflightEstimate(client, {
-		operation: "batch",
-		assetType,
-		mediaKind,
-		prompt,
-		count,
-		model: imageOptions.model ?? audioModelOptions.model,
-		aspectRatio: imageOptions.aspectRatio,
-		imageSize: imageOptions.imageSize,
-		...musicProvider ? { musicProvider } : {}
-	});
 	console.log(`Batch generating ${count} ${mediaKind === "image" ? "image" : mediaKind === "video" ? "video" : "audio file"}(s) for "${name}"...`);
 	const audioVoiceOptions = mediaKind === "audio" ? parseAudioVoiceOptions(parsed) : {};
 	let startedBatch;
@@ -8309,16 +8209,21 @@ function parseVideoGenerationOptions(parsed, mediaKind) {
 	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");
+	if (resolutionValue !== void 0 && !videoResolution) throw new Error("--resolution must be 480p, 720p, 1080p, or 4k");
 	const videoDurationSeconds = durationValue === void 0 ? void 0 : normalizeVideoGenerationDurationSeconds(durationValue);
-	if (durationValue !== void 0 && !videoDurationSeconds) throw new Error("--duration must be 4, 6, or 8");
+	if (durationValue !== void 0 && !videoDurationSeconds) throw new Error("--duration must be an integer from 4 to 15");
 	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 ((isKlingVideoGenerationModel(model) || isFalVideoGenerationModel(model)) && tierValue !== void 0) throw new Error("--tier is only supported with --model veo-3.1");
 	if (videoResolution && videoTier && !isVideoGenerationResolutionSupportedForTier(videoResolution, videoTier)) throw new Error("--resolution 4k is not supported with --tier lite");
-	if (videoResolution && (isKlingVideoGenerationModel(model) || isFalVideoGenerationModel(model)) && !isVideoGenerationResolutionSupportedForModel(model, videoResolution)) throw new Error(`--model ${getVideoModelSelectionForModel(model) ?? model} supports only --resolution 720p or 1080p`);
+	if (videoResolution && (isKlingVideoGenerationModel(model) || isFalVideoGenerationModel(model)) && !isVideoGenerationResolutionSupportedForModel(model, videoResolution)) throw new Error(`--model ${getVideoModelSelectionForModel(model) ?? model} does not support --resolution ${videoResolution}`);
+	if (!isFalSeedance2VideoGenerationModel(model) && videoDurationSeconds && ![
+		4,
+		6,
+		8
+	].includes(videoDurationSeconds)) throw new Error("--duration must be 4, 6, or 8 for this model");
 	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 {
@@ -8346,7 +8251,8 @@ function validateVideoFrameReferenceOptions(command, parsed, mediaKind) {
 	const tierValue = readOptionalOption(parsed, "tier", "tier") ?? readOptionalOption(parsed, "video-tier", "videoTier");
 	const videoTier = tierValue === void 0 ? void 0 : normalizeVideoGenerationTier(tierValue);
 	const model = parseVideoModelOption(readOptionalOption(parsed, "model", "model"), videoTier);
-	if (isFalVideoGenerationModel(model) || isGeminiOmniVideoGenerationModel(model) || isKlingVideoGenerationModel(model) && Boolean(lastFrame)) throw new Error("--first-frame and --last-frame are only supported with --model veo-3.1");
+	if (isFalSeedance2VideoGenerationModel(model) && !firstFrame) throw new Error("--model seedance-2 requires --first-frame");
+	if (!isFalSeedance2VideoGenerationModel(model) && (isFalVideoGenerationModel(model) || isGeminiOmniVideoGenerationModel(model) || isKlingVideoGenerationModel(model) && Boolean(lastFrame))) throw new Error("--first-frame and --last-frame are only supported with --model veo-3.1 or seedance-2");
 }
 function readVideoFrameOption(parsed, kebabName, camelName) {
 	const value = parsed.options[kebabName] ?? parsed.options[camelName];
@@ -8669,8 +8575,8 @@ function parseVideoCommand(value) {
 }
 function printUsage$7() {
 	const aspectValues = VIDEO_GENERATION_ASPECT_RATIOS.join("|");
-	const resolutionValues = Array.from(new Set(VIDEO_GENERATION_TIERS.flatMap((tier) => getVideoGenerationResolutionsForTier(tier)))).join("|");
-	const durationValues = VIDEO_GENERATION_DURATION_SECONDS.join("|");
+	const resolutionValues = Array.from(new Set(["480p", ...VIDEO_GENERATION_TIERS.flatMap((tier) => getVideoGenerationResolutionsForTier(tier))])).join("|");
+	const durationValues = Array.from(new Set([...VIDEO_GENERATION_DURATION_SECONDS, ...SEEDANCE_2_DURATION_SECONDS])).join("|");
 	const tierValues = VIDEO_GENERATION_TIERS.join("|");
 	const modelValues = (operation) => VIDEO_MODEL_SELECTIONS.filter((model) => VIDEO_MODEL_SUPPORTED_OPERATIONS[model].includes(operation)).join("|");
 	const resolutionByTier = VIDEO_GENERATION_TIERS.map((tier) => `${tier}: ${getVideoGenerationResolutionsForTier(tier).join(", ")}`).join("; ");
@@ -8681,21 +8587,22 @@ Usage:
   makefx video refine --variant <variant_id> "prompt" -o <file> [--model ${modelValues("refine")}] [--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> [--model ${modelValues("derive")}] [--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 --first-frame <variant_or_file> [--last-frame <variant_or_file>] --name <name> --type <type> "prompt" -o <file> [--model veo-3.1|seedance-2|seedance-2-fast] [--aspect ${aspectValues}] [--resolution ${resolutionValues}] [--duration ${durationValues}] [--tier ${tierValues}] [--audio] [--space <id>]
   makefx video derive --follow <variant_id> -o <file> [--space <id>]
 
 Video:
   --model <value>       Generate: ${modelValues("generate")}; refine/derive: ${modelValues("refine")}
   --aspect <ratio>      Video aspect ratio: ${aspectValues}
-  --resolution <value>  Veo: ${resolutionValues}; Kling/fal Seedance: 720p|1080p (${resolutionByTier})
-  --duration <seconds>  Veo/Kling/fal Seedance output duration: ${durationValues}
+  --resolution <value>  Supported: ${resolutionValues}; Veo: 720p|1080p|4k; Kling: 720p|1080p; Seedance 2: standard 480p|720p|1080p, fast 480p|720p (${resolutionByTier})
+  --duration <seconds>  Veo/Kling: ${VIDEO_GENERATION_DURATION_SECONDS.join("|")}; Seedance 2: ${SEEDANCE_2_DURATION_SECONDS.join("|")}
   --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
+  --first-frame <ref>   Veo or Seedance 2 start frame image variant or local image path
+  --last-frame <ref>    Veo or Seedance 2 final frame image variant or local image path
 
-Veo 3.1 frames:
+Frame inputs:
   --first-frame resolves to the first referenceVariantId and becomes the Veo top-level image input.
-  --last-frame resolves to the second referenceVariantId and becomes Veo config.lastFrame.
+  --last-frame resolves to the second referenceVariantId and becomes Veo config.lastFrame or Seedance 2 end_image_url.
+  Seedance 2 requires --first-frame and supports an optional --last-frame.
   Use both flags together for first/last-frame generation; --last-frame requires --first-frame.
   Do not combine frame flags with --refs. Use --refs when you want generic Veo reference images instead of first/last-frame inputs.
 
@@ -9910,6 +9817,7 @@ function printUsageSummary(summary, print) {
 	print(`  Storage:       ${formatBytes(summary.totals.storageBytes)}`);
 	print(`  Workflow runs: ${summary.totals.workflowRuns}`);
 	print(`  Delivery:      ${formatBytes(summary.totals.deliveryBytes)}`);
+	print(`  Provider spend: $${summary.providerSpend.amountUsd.toFixed(6)} (${summary.providerSpend.entries} recorded entr${summary.providerSpend.entries === 1 ? "y" : "ies"}, ${summary.providerSpend.unpricedEntries} unpriced)`);
 	if (summary.byMediaKind.length > 0) {
 		print("\nBy media kind:");
 		print("Media".padEnd(10) + "Storage".padEnd(14) + "Workflows".padEnd(12) + "Delivery".padEnd(14) + "Events");
@@ -10139,7 +10047,7 @@ Options:
 }
 //#endregion
 //#region src/cli/index.ts
-var CLI_VERSION = "1.1.0+e479be18b9f5";
+var CLI_VERSION = "1.2.0+10cb109b7379";
 async function main() {
 	const argv = process$1.argv.slice(2);
 	if (argv[0] === "--") argv.shift();
@@ -10199,13 +10107,13 @@ function imageCapabilityHelp(operation) {
   --collection <id> Place the completed asset in a Space collection`;
 }
 function videoResolutionValues() {
-	return optionValues(uniqueValues(VIDEO_GENERATION_TIERS.flatMap((tier) => getVideoGenerationResolutionsForTier(tier))));
+	return optionValues(uniqueValues(["480p", ...VIDEO_GENERATION_TIERS.flatMap((tier) => getVideoGenerationResolutionsForTier(tier))]));
 }
 function videoAspectValues() {
 	return optionValues(VIDEO_GENERATION_ASPECT_RATIOS);
 }
 function videoDurationValues() {
-	return optionValues(VIDEO_GENERATION_DURATION_SECONDS);
+	return optionValues(uniqueValues([...VIDEO_GENERATION_DURATION_SECONDS, ...SEEDANCE_2_DURATION_SECONDS]));
 }
 function videoTierValues() {
 	return optionValues(VIDEO_GENERATION_TIERS);
@@ -10219,18 +10127,19 @@ function videoCapabilityHelp(operation) {
 	return `Video:
   --model <value>       Video model: ${videoModelValues(operation)}
   --aspect <ratio>      Video aspect ratio: ${videoAspectValues()}
-  --resolution <value>  Veo: ${videoResolutionValues()}; Kling/fal Seedance: 720p|1080p (${resolutionLines})
-  --duration <seconds>  Veo/Kling/fal Seedance output duration: ${videoDurationValues()}
+  --resolution <value>  Supported: ${videoResolutionValues()}; Veo: 720p|1080p|4k; Kling: 720p|1080p; Seedance 2: standard 480p|720p|1080p, fast 480p|720p (${resolutionLines})
+  --duration <seconds>  Veo/Kling: ${optionValues(VIDEO_GENERATION_DURATION_SECONDS)}; Seedance 2: ${optionValues(SEEDANCE_2_DURATION_SECONDS)}
   --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
+  --first-frame <ref>   Veo or Seedance 2 start frame image variant or local image path
+  --last-frame <ref>    Veo or Seedance 2 final frame image variant or local image path
   Model operations: ${operationLines}
   --follow <id>         Resume/download a variant after a long generation or disconnect
   --collection <id>     Place the completed asset in a Space collection
 
-Veo 3.1 frames:
+Frame inputs:
   --first-frame resolves to the first referenceVariantId and becomes the Veo top-level image input.
-  --last-frame resolves to the second referenceVariantId and becomes Veo config.lastFrame.
+  --last-frame resolves to the second referenceVariantId and becomes Veo config.lastFrame or Seedance 2 end_image_url.
+  Seedance 2 requires --first-frame and supports an optional --last-frame.
   Use both flags together for first/last-frame generation; --last-frame requires --first-frame.
   Do not combine frame flags with --refs. Use --refs when you want generic Veo reference images instead of first/last-frame inputs.`;
 }
@@ -10679,7 +10588,7 @@ Long runs:
 		console.log(`
 Usage:
   makefx video derive --refs <variant_or_file,variant_or_file> --name <name> --type <type> "prompt" -o <file> [--model ${videoModelValues("derive")}] [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--collection <id>] [--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] [--collection <id>] [--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|seedance-2|seedance-2-fast] [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--collection <id>] [--space <id>]
   makefx video derive --follow <variant_id> -o <file> [--collection <id>] [--space <id>]
 
 ${videoCapabilityHelp("derive")}
@@ -10699,12 +10608,12 @@ Usage:
   makefx video generate --follow <variant_id> -o <file> [--collection <id>] [--space <id>]
   makefx video refine --variant <variant_id> "prompt" -o <file> [--model ${videoModelValues()}] [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--collection <id>] [--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] [--collection <id>] [--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] [--collection <id>] [--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|seedance-2|seedance-2-fast] [--aspect ${videoAspectValues()}] [--resolution ${videoResolutionValues()}] [--duration ${videoDurationValues()}] [--tier ${videoTierValues()}] [--audio] [--collection <id>] [--space <id>]
 
 ${videoCapabilityHelp()}
 
 Audio:
-  Veo and Kling default to generated audio. fal Seedance is silent and generate-only.
+  Veo and Kling default to generated audio. Seedance v1 is silent and generate-only; Seedance 2 is silent and supports generate and derive.
   Current Veo models do not support --no-audio; the CLI rejects it before creating a job.
 
 Long runs:

package/package.json

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