makefx 1.5.0 → 1.6.1

package/README.md

@@ -61,4 +61,4 @@ IDs, or runs. Retired commands and aliases are not redirected.
 
 Run `makefx --help` or `makefx <noun> --help` for current options.
 
-Version: 1.5.0
+Version: 1.6.1

package/makefx.mjs

@@ -621,9 +621,85 @@ function isProviderAuthMessage(message, providerErrorCode, provider) {
 	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/shared/generation-blockers.ts
+var GENERATION_BLOCKER_CODES = [
+	"SUBSCRIPTION_REQUIRED",
+	"PROVIDER_KEY_REQUIRED",
+	"BYOK_CREDENTIAL_FAILED",
+	"MANAGED_AI_UNAVAILABLE"
+];
+var PROVIDER_LABELS = {
+	google_ai: "Google AI",
+	elevenlabs: "ElevenLabs",
+	lyria: "Lyria",
+	kling: "Kling",
+	fal: "fal.ai",
+	replicate: "Replicate"
+};
+function isGenerationBlockerCode(code) {
+	return GENERATION_BLOCKER_CODES.includes(code);
+}
+function inferGenerationBlockerProvider(message) {
+	const normalized = message?.toLowerCase() ?? "";
+	if (normalized.includes("google ai") || normalized.includes("gemini") || normalized.includes("veo")) return "google_ai";
+	if (normalized.includes("elevenlabs")) return "elevenlabs";
+	if (normalized.includes("lyria")) return "lyria";
+	if (normalized.includes("kling")) return "kling";
+	if (normalized.includes("fal.ai") || normalized.includes("fal provider")) return "fal";
+	if (normalized.includes("replicate")) return "replicate";
+}
+function generationBlockerProviderFromService(provider) {
+	if (provider === "google_ai" || provider === "veo") return "google_ai";
+	if (provider === "elevenlabs" || provider === "lyria" || provider === "kling" || provider === "fal" || provider === "replicate") return provider;
+}
+function getGenerationBlockerPresentation(code, serverMessage, provider) {
+	if (!isGenerationBlockerCode(code)) return null;
+	if (code === "SUBSCRIPTION_REQUIRED") return {
+		code,
+		message: "A Make Effects Platform subscription is required before generation can start.",
+		retryable: false,
+		actionLabel: "View billing",
+		actionPath: "/profile#billing",
+		remediation: "Start or restore the Make Effects Platform subscription at https://makefx.app/profile#billing, then try again."
+	};
+	if (code === "MANAGED_AI_UNAVAILABLE") return {
+		code,
+		message: "Managed generation is coming soon and cannot be selected yet.",
+		retryable: false,
+		remediation: "Connect your provider account and choose a supported model. Managed generation is not available yet."
+	};
+	const resolvedProvider = provider ?? inferGenerationBlockerProvider(serverMessage);
+	const providerLabel = resolvedProvider ? PROVIDER_LABELS[resolvedProvider] : "provider";
+	const actionPath = resolvedProvider ? `/profile#provider-key-${resolvedProvider}` : "/profile#provider-keys";
+	const setupUrl = `https://makefx.app${actionPath}`;
+	if (code === "PROVIDER_KEY_REQUIRED") return {
+		code,
+		message: `A ${providerLabel} account key is required before generation can start.`,
+		retryable: false,
+		actionLabel: "Configure key",
+		actionPath,
+		remediation: `Configure the ${providerLabel} account key at ${setupUrl}, then try again.`,
+		...resolvedProvider ? { provider: resolvedProvider } : {}
+	};
+	return {
+		code,
+		message: `The ${providerLabel} account key could not be used. Replace or reconnect it before trying again.`,
+		retryable: false,
+		actionLabel: "Reconnect key",
+		actionPath,
+		remediation: `Replace or reconnect the ${providerLabel} account key at ${setupUrl}, then try again.`,
+		...resolvedProvider ? { provider: resolvedProvider } : {}
+	};
+}
+function formatGenerationBlockerForTerminal(code, message) {
+	const blocker = getGenerationBlockerPresentation(code, message);
+	if (!blocker) return `${code}: ${message}`;
+	return `${blocker.code}: ${blocker.message}\n${blocker.remediation}`;
+}
+//#endregion
 //#region src/cli/lib/error-format.ts
 function formatServerErrorMessage(code, message) {
-	return `${code}: ${formatGenerationFailureMessage(message)}`;
+	return formatGenerationBlockerForTerminal(code, formatGenerationFailureMessage(message));
 }
 function formatGenerationFailureMessage(message, providerMetadata) {
 	return sanitizeGenerationFailureMessage(message, providerMetadata);
@@ -631,6 +707,9 @@ function formatGenerationFailureMessage(message, providerMetadata) {
 function getGenerationFailureCode(providerMetadata) {
 	return extractGenerationDiagnostic(providerMetadata)?.code ?? "GENERATION_FAILED";
 }
+function getGenerationFailureProvider(providerMetadata) {
+	return extractGenerationDiagnostic(providerMetadata)?.provider;
+}
 //#endregion
 //#region src/shared/compact-references.ts
 var COMPACT_ID_LENGTH = 8;
@@ -4358,6 +4437,16 @@ var import_websocket = /* @__PURE__ */ __toESM(require_websocket(), 1);
 require_websocket_server();
 var wrapper_default = import_websocket.default;
 //#endregion
+//#region src/cli/version.ts
+var CLI_VERSION = "1.6.1+00259d259e65";
+var CLI_VERSION_HEADER = "X-MakeFX-CLI-Version";
+function cliVersionHeaders() {
+	return {
+		[CLI_VERSION_HEADER]: CLI_VERSION,
+		"User-Agent": `makefx/${CLI_VERSION}`
+	};
+}
+//#endregion
 //#region src/cli/lib/websocket-client.ts
 /**
 * WebSocket Client for CLI
@@ -4444,7 +4533,10 @@ var WebSocketClient = class WebSocketClient {
 		return new Promise((resolve, reject) => {
 			const protocol = this.baseUrl.startsWith("https") ? "wss" : "ws";
 			const url = `${protocol}://${this.baseUrl.replace(/^https?:\/\//, "")}/api/spaces/${this.spaceId}/ws`;
-			const wsOptions = { headers: { "Authorization": `Bearer ${this.accessToken}` } };
+			const wsOptions = { headers: {
+				"Authorization": `Bearer ${this.accessToken}`,
+				...cliVersionHeaders()
+			} };
 			if (this.env === "local" && protocol === "wss") wsOptions.agent = new https.Agent({ rejectUnauthorized: false });
 			else if (this.env === "local" && protocol === "ws") wsOptions.agent = new http.Agent();
 			this.ws = new wrapper_default(url, wsOptions);
@@ -4722,7 +4814,8 @@ var WebSocketClient = class WebSocketClient {
 				success: variant.status === "completed",
 				variant: variant.status === "completed" ? variant : void 0,
 				error: variant.status === "failed" ? formatGenerationFailureMessage(variant.error_message, variant.provider_metadata) : void 0,
-				errorCode: variant.status === "failed" ? getGenerationFailureCode(variant.provider_metadata) : void 0
+				errorCode: variant.status === "failed" ? getGenerationFailureCode(variant.provider_metadata) : void 0,
+				errorProvider: variant.status === "failed" ? getGenerationFailureProvider(variant.provider_metadata) : void 0
 			});
 		}
 		return handled;
@@ -5017,7 +5110,9 @@ var WebSocketClient = class WebSocketClient {
 				videoDurationSeconds: params.videoDurationSeconds,
 				videoTier: params.videoTier,
 				seedanceDuration: params.seedanceDuration,
-				seedanceBitrateMode: params.seedanceBitrateMode
+				seedanceBitrateMode: params.seedanceBitrateMode,
+				avatarResolution: params.avatarResolution,
+				avatarMode: params.avatarMode
 			};
 			try {
 				this.send(message);
@@ -5870,6 +5965,16 @@ function readIsoBmffVideoMetadata(bytes) {
 	return durationMs ? { durationMs } : {};
 }
 //#endregion
+//#region src/shared/avatarGenerationOptions.ts
+var AVATAR_MODEL_IDS = ["kling-avatar-v2"];
+var AVATAR_MODES = ["standard", "pro"];
+function isAvatarModelId(value) {
+	return typeof value === "string" && AVATAR_MODEL_IDS.includes(value);
+}
+function isAvatarMode(value) {
+	return typeof value === "string" && AVATAR_MODES.includes(value);
+}
+//#endregion
 //#region src/shared/seedance2Capabilities.ts
 var SEEDANCE_2_ASPECT_RATIOS = [
 	"auto",
@@ -6381,6 +6486,20 @@ var MEDIA_OPERATION_MATRIX = [
 		cliCommands: ["generate"],
 		cliSupportsRefs: true
 	},
+	{
+		mode: "avatar",
+		label: "Avatar",
+		shortLabel: "Avatar",
+		mediaKind: "video",
+		assetType: "avatar",
+		promptNoun: "avatar video",
+		inheritsReferenceAssetType: false,
+		compatibleSlotMediaKinds: ["image", "audio"],
+		supportsBatch: false,
+		cliNamespace: null,
+		cliCommands: [],
+		cliSupportsRefs: false
+	},
 	{
 		mode: "speech",
 		label: "Speech",
@@ -6621,7 +6740,8 @@ var CLI_GENERATION_MEDIA_OPTIONS = {
 		"last-frame",
 		"image-refs",
 		"video-refs",
-		"audio-refs"
+		"audio-refs",
+		"mode"
 	]
 };
 function rejectUnknownGenerationOptions(options, mediaKind) {
@@ -6669,12 +6789,12 @@ function validateAudioModeRequiredVoiceOptions(options, mode) {
 	if (mode === "dialogue" && !normalizeCliOption(options["dialogue-voices"] ?? options.dialogueVoices)) throw new Error("Dialogue generation requires --dialogue-voices <voice_id,voice_id>. Run: makefx audio voices");
 }
 async function executeGenerate(parsed, ctx, client, deps, mediaKind, followOptions = {}) {
-	const prompt = getPrompt(parsed, "generate");
+	const videoOptions = parseVideoGenerationOptions(parsed, mediaKind);
+	const prompt = isAvatarModelId(videoOptions.model) ? parsed.positionals.join(" ").trim() : getPrompt(parsed, "generate");
 	const outputPath = getOutputPath(parsed);
 	const name = requireOption(parsed, "name");
 	const assetType = requireOption(parsed, "type");
 	const musicProvider = parseMusicProviderOption(parsed, mediaKind, assetType);
-	const videoOptions = parseVideoGenerationOptions(parsed, mediaKind);
 	const effectiveVideoModel = videoOptions.model ?? getVideoGenerationModelForSelection();
 	const seedanceCapability = mediaKind === "video" ? getSeedance2CapabilityByEndpoint(effectiveVideoModel) : void 0;
 	const videoFrameRefs = parseVideoFrameReferenceOptions(parsed, "generate", mediaKind).refs;
@@ -6693,7 +6813,7 @@ async function executeGenerate(parsed, ctx, client, deps, mediaKind, followOptio
 		...deps,
 		waitForReferenceVariant: (variant) => waitForReferenceVariant(client, variant)
 	};
-	const resolvedSeedanceRefs = state && seedanceReferenceCount > 0 ? await resolveSeedanceReferenceIds(seedanceRefs, ctx, referenceDeps, state) : {
+	const resolvedSeedanceRefs = state && seedanceReferenceCount > 0 ? isAvatarModelId(effectiveVideoModel) ? await resolveAvatarReferenceIds(seedanceRefs, ctx, referenceDeps, state) : await resolveSeedanceReferenceIds(seedanceRefs, ctx, referenceDeps, state) : {
 		refs: [],
 		ids: []
 	};
@@ -6847,6 +6967,10 @@ function parseSeedanceReferenceOptions(parsed) {
 	};
 }
 function validateSeedanceReferenceOptions(options, model, command) {
+	if (isAvatarModelId(model)) {
+		if (options.imageRefs.length !== 1 || options.audioRefs.length !== 1 || options.videoRefs.length !== 0) throw new Error("Avatar generation requires exactly one --image-refs portrait and one --audio-refs input");
+		return;
+	}
 	const capability = getSeedance2CapabilityByEndpoint(model);
 	const total = options.imageRefs.length + options.videoRefs.length + options.audioRefs.length;
 	if (!capability) {
@@ -6864,6 +6988,15 @@ function validateSeedanceReferenceOptions(options, model, command) {
 	});
 	if (error) throw new Error(error.message);
 }
+async function resolveAvatarReferenceIds(options, ctx, deps, state) {
+	const resolve = (refs, kind) => resolveReferenceVariantIds(refs, ctx, deps, state.variants, "video", state.assets, kind);
+	const imageIds = await resolve(options.imageRefs, "image");
+	const audioIds = await resolve(options.audioRefs, "audio");
+	return {
+		refs: [...options.imageRefs, ...options.audioRefs],
+		ids: [...imageIds, ...audioIds]
+	};
+}
 async function resolveSeedanceReferenceIds(options, ctx, deps, state, implicitVideoReferenceIds = []) {
 	await preflightLocalSeedanceReferences({
 		...options,
@@ -7141,7 +7274,9 @@ function compactStartedVariantRef(started) {
 }
 function formatTerminalGenerationError(result) {
 	const message = result.error || "Generation failed without a completed variant";
-	return result.errorCode ? `${result.errorCode}: ${message}` : message;
+	if (!result.errorCode) return message;
+	const blocker = getGenerationBlockerPresentation(result.errorCode, message, generationBlockerProviderFromService(result.errorProvider));
+	return blocker ? `${blocker.code}: ${blocker.message}\n${blocker.remediation}` : formatGenerationBlockerForTerminal(result.errorCode, message);
 }
 function throwGenerationWaitErrorIfNeeded(input, params) {
 	if (!isGenerationWaitTimeout(input)) throw input;
@@ -7196,7 +7331,7 @@ function validateVideoAudioOptions(parsed, mediaKind) {
 	const model = parseVideoModelOption(modelValue, videoTier, parsed);
 	if (parsed.options.audio !== void 0 && (isGeminiOmniVideoGenerationModel(model) || isFalSeedanceV1VideoGenerationModel(model))) throw new Error("--audio is only supported with --model veo-3.1, kling, or Seedance 2");
 	if (parsed.options["no-audio"] !== void 0) {
-		if (!doesVideoGenerationModelSupportAudioToggle(model) && !isFalSeedance2VideoGenerationModel(model)) throw new Error(`${model} does not support --no-audio. Use the default audio-enabled output or omit the flag.`);
+		if (isAvatarModelId(model) || !doesVideoGenerationModelSupportAudioToggle(model) && !isFalSeedance2VideoGenerationModel(model)) throw new Error(`${model} does not support --no-audio. Use the default audio-enabled output or omit the flag.`);
 	}
 }
 function parseVideoAudioOptions(parsed, mediaKind) {
@@ -7211,6 +7346,7 @@ function parseVideoGenerationOptions(parsed, mediaKind) {
 	const durationValue = readOptionalOption(parsed, "duration");
 	const tierValue = readOptionalOption(parsed, "tier");
 	const bitrateValue = readOptionalOption(parsed, "bitrate");
+	const modeValue = readOptionalOption(parsed, "mode");
 	const modelValue = mediaKind === "video" ? readOptionalOption(parsed, "model") : void 0;
 	const aspectValue = mediaKind === "video" ? readOptionalOption(parsed, "aspect") : void 0;
 	if (mediaKind !== "video" && resolutionValue === void 0 && durationValue === void 0 && tierValue === void 0 && aspectValue === void 0 && bitrateValue === void 0) return {};
@@ -7220,6 +7356,17 @@ function parseVideoGenerationOptions(parsed, mediaKind) {
 	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, parsed);
+	if (isAvatarModelId(model)) {
+		if (parsed.options.refs !== void 0 || parsed.options["first-frame"] !== void 0 || parsed.options["last-frame"] !== void 0) throw new Error("Avatar models accept only --image-refs and --audio-refs");
+		if (aspectValue !== void 0 || durationValue !== void 0 || tierValue !== void 0 || bitrateValue !== void 0 || parsed.options.audio !== void 0 || parsed.options["no-audio"] !== void 0) throw new Error("Avatar models do not accept --aspect, --duration, --tier, --bitrate, --audio, or --no-audio");
+		if (resolutionValue !== void 0) throw new Error("--resolution is not supported by Avatar models");
+		if (modeValue !== void 0 && !isAvatarMode(modeValue)) throw new Error(`--mode must be ${AVATAR_MODES.join(" or ")}`);
+		return {
+			model,
+			...modeValue ? { avatarMode: modeValue } : {}
+		};
+	}
+	if (modeValue !== void 0) throw new Error("--mode is only supported by --model kling-avatar-v2");
 	const seedanceCapability = getSeedance2CapabilityByEndpoint(model);
 	const seedanceDuration = durationValue === void 0 ? void 0 : durationValue === "auto" ? "auto" : normalizeVideoGenerationDurationSeconds(durationValue);
 	const videoDurationSeconds = durationValue === void 0 || durationValue === "auto" ? void 0 : normalizeVideoGenerationDurationSeconds(durationValue);
@@ -7315,6 +7462,7 @@ function parseVideoModelOption(value, tier, parsed) {
 	const normalized = normalizeCliOption(value);
 	const effectiveTier = tier ?? "generate";
 	if (!normalized) return getVideoGenerationModelForSelection(DEFAULT_VIDEO_MODEL_SELECTION, effectiveTier);
+	if (isAvatarModelId(normalized)) return normalized;
 	if (normalized === "seedance-2" || normalized === "seedance-2-fast") {
 		const hasFrames = Boolean(parsed?.options["first-frame"] || parsed?.options["last-frame"]);
 		const hasReferences = Boolean(parsed?.options.refs || parsed?.options["image-refs"] || parsed?.options["video-refs"] || parsed?.options["audio-refs"]);
@@ -7322,7 +7470,7 @@ function parseVideoModelOption(value, tier, parsed) {
 	}
 	const selection = normalizeVideoModelSelection(normalized === "seedance-1" ? "fal-seedance" : normalized);
 	if (selection) return getVideoGenerationModelForSelection(selection, effectiveTier);
-	throw new Error("--model must be veo-3.1, omni-flash, kling, seedance-1, seedance-2, or seedance-2-fast");
+	throw new Error("--model must be veo-3.1, omni-flash, kling, seedance-1, seedance-2, seedance-2-fast, or kling-avatar-v2");
 }
 function parseImageModelOption(value) {
 	if (!value) return void 0;
@@ -7360,6 +7508,10 @@ function validateImageModelOperation(command, mediaKind, model) {
 function validateVideoModelOperation(command, mediaKind, model) {
 	if (mediaKind !== "video") return;
 	const effectiveModel = model ?? getVideoGenerationModelForSelection();
+	if (isAvatarModelId(effectiveModel)) {
+		if (command === "generate") return;
+		throw new Error(`--model ${effectiveModel} does not support video ${command}`);
+	}
 	if (isVideoOperationSupportedByModel(effectiveModel, command)) return;
 	throw new Error(`--model ${getVideoModelSelectionForModel(effectiveModel) ?? effectiveModel} does not support video ${command}`);
 }
@@ -7435,7 +7587,8 @@ async function executeRegenerate(mediaKind, parsed, deps = defaultDeps$11, audio
 		headers: {
 			Authorization: `Bearer ${config.token.accessToken}`,
 			Accept: "application/json",
-			"Content-Type": "application/json"
+			"Content-Type": "application/json",
+			...cliVersionHeaders()
 		},
 		body: JSON.stringify(body)
 	});
@@ -7799,14 +7952,14 @@ async function handleBilling(parsed) {
 }
 function printBillingHelp() {
 	console.log(`
-Billing Commands - Polar.sh Usage Sync
+Billing Commands - Platform Subscription Operations
 
 Usage:
   makefx billing <subcommand> [--env <environment>]
 
 Subcommands:
   status           Show sync status (pending, failed, synced events)
-  check            Run operational checks for workers, Polar meters, and sync health
+  check            Run operational checks for workers, Polar product, and sync health
   reconcile        Compare local billable usage with Polar usage for one user
   retry-failed     Reset failed events for retry (next cron will sync them)
 
@@ -7953,6 +8106,16 @@ function secondsSummary(seconds) {
 	const remainingSeconds = seconds % 60;
 	return remainingSeconds > 0 ? `${minutes}m ${remainingSeconds}s` : `${minutes}m`;
 }
+function resolveBillingOpsResult(options) {
+	const statuses = [
+		...options.workerStatuses,
+		options.billingStatus,
+		options.webhookStatus
+	];
+	if (statuses.includes("critical")) return "critical";
+	if (statuses.includes("warning")) return "warning";
+	return "ok";
+}
 async function handleBillingOpsCheck(env) {
 	console.log(`Running billing operational checks for ${env}...\n`);
 	const workerChecks = await checkWorkerHealth(env);
@@ -7969,22 +8132,22 @@ async function handleBillingOpsCheck(env) {
 		process$1.exitCode = 1;
 		return;
 	}
-	const meterCheck = billingChecks.checks.polarMeters;
-	console.log("\nPolar meters:");
-	console.log(`  ${statusLabel(meterCheck.status)} configured=${meterCheck.configured} active=${meterCheck.active.length} expected=${meterCheck.expected.length}`);
-	if (meterCheck.error) console.log(`  Error: ${meterCheck.error}`);
-	if (meterCheck.missing.length > 0) console.log(`  Missing: ${meterCheck.missing.join(", ")}`);
-	if (meterCheck.invalid.length > 0) console.log(`  Invalid: ${meterCheck.invalid.map((meter) => meter.name).join(", ")}`);
-	const productCheck = billingChecks.checks.paidGenerationProduct;
-	if (productCheck) {
-		console.log("\nPaid generation product:");
-		const product = productCheck.product;
-		console.log(`  ${statusLabel(productCheck.status)} configured=${product?.configured ?? false} recurring=${product?.isRecurring ?? "n/a"} archived=${product?.isArchived ?? "n/a"}`);
-		if (product?.productId) console.log(`  Product: ${product.productId}${product.name ? ` (${product.name})` : ""}`);
-		console.log(`  Metered prices: ${product?.meteredPriceMeters.length ?? 0}/${productCheck.expectedMeteredPriceMeters.length}`);
-		if (productCheck.missingMeteredPriceMeters.length > 0) console.log(`  Missing metered prices: ${productCheck.missingMeteredPriceMeters.join(", ")}`);
-		if (productCheck.unexpectedMeterCreditBenefitMeters.length > 0) console.log(`  Unexpected meter-credit benefits: ${productCheck.unexpectedMeterCreditBenefitMeters.join(", ")}`);
-	}
+	const productCheck = billingChecks.checks.platformSubscriptionProduct;
+	console.log("\nPlatform subscription product:");
+	const product = productCheck.product;
+	console.log(`  ${statusLabel(productCheck.status)} configured=${product?.configured ?? false} recurring=${product?.isRecurring ?? "n/a"} archived=${product?.isArchived ?? "n/a"}`);
+	console.log(`  Environment: ${productCheck.actualEnvironment} (expected ${productCheck.expectedEnvironment})`);
+	if (product?.productId) console.log(`  Product: ${product.productId}${product.name ? ` (${product.name})` : ""}`);
+	if (product?.fixedPrices.length) console.log(`  Fixed price: ${product.fixedPrices.map((price) => `${price.amount} ${price.currency}/${price.interval ?? "one-time"}`).join(", ")}`);
+	for (const error of productCheck.errors) console.log(`  Error: ${error}`);
+	const webhookCheck = billingChecks.checks.webhook ?? {
+		status: "critical",
+		configured: false,
+		error: "Webhook readiness was not reported by the application Worker"
+	};
+	console.log("\nWebhook verifier:");
+	console.log(`  ${statusLabel(webhookCheck.status)} configured=${webhookCheck.configured}`);
+	if (webhookCheck.error) console.log(`  Error: ${webhookCheck.error}`);
 	const syncCheck = billingChecks.checks.syncHealth;
 	console.log("\nSync health:");
 	console.log(`  ${statusLabel(syncCheck.status)} pending=${syncCheck.events.pending} failed=${syncCheck.events.failed} synced=${syncCheck.events.synced}`);
@@ -7993,13 +8156,15 @@ async function handleBillingOpsCheck(env) {
 	const internalCheck = billingChecks.checks.internalUsers;
 	console.log("\nInternal users:");
 	console.log(`  ${statusLabel(internalCheck.status)} users=${internalCheck.internalUsers} nonBillableEvents=${internalCheck.nonBillableEvents} billableEvents=${internalCheck.billableEvents}`);
-	const hasCriticalWorker = workerChecks.some((check) => check.status === "critical");
-	const hasCriticalBilling = billingChecks.status === "critical";
-	const hasWarning = workerChecks.some((check) => check.status === "warning") || billingChecks.status === "warning";
-	if (hasCriticalWorker || hasCriticalBilling) {
+	const resultStatus = resolveBillingOpsResult({
+		workerStatuses: workerChecks.map((check) => check.status),
+		billingStatus: billingChecks.status,
+		webhookStatus: webhookCheck.status
+	});
+	if (resultStatus === "critical") {
 		console.log("\nResult: CRITICAL - billing operations need attention.");
 		process$1.exitCode = 1;
-	} else if (hasWarning) console.log("\nResult: WARNING - billing is operational but has lag or cleanup work.");
+	} else if (resultStatus === "warning") console.log("\nResult: WARNING - billing is operational but has lag or cleanup work.");
 	else console.log("\nResult: OK - billing workers, meters, and sync health are ready.");
 }
 async function handleBillingReconcile(env, parsed) {
@@ -8537,7 +8702,6 @@ function imageGenerator(capability) {
 		id: `image/${capability.selection}`,
 		label: capability.label,
 		mediaKind: "image",
-		provider: capability.provider === "gemini" ? "google_ai" : "fal",
 		modelIds: [capability.modelId],
 		defaultModelId: capability.modelId,
 		operations,
@@ -8617,7 +8781,6 @@ function videoGenerator(selection) {
 		id: `video/${selection}`,
 		label: VIDEO_MODEL_LABELS[selection],
 		mediaKind: "video",
-		provider: selection === "kling" ? "kling" : selection === "fal-seedance" ? "fal" : "google_ai",
 		modelIds,
 		defaultModelId: defaultModel,
 		operations,
@@ -8714,7 +8877,6 @@ function seedanceVideoGenerator(capability) {
 		id: capability.generatorId,
 		label: capability.label,
 		mediaKind: "video",
-		provider: "fal",
 		modelIds: [capability.endpointId],
 		defaultModelId: capability.endpointId,
 		operations,
@@ -8743,6 +8905,72 @@ function seedanceVideoGenerator(capability) {
 		]
 	};
 }
+function avatarVideoGenerator(model) {
+	const parameters = [input("mode", "string", false, "Generation quality.", {
+		allowedValues: AVATAR_MODES,
+		defaultValue: "standard"
+	})];
+	return {
+		id: `video/${model}`,
+		label: "Kling Avatar V2",
+		mediaKind: "video",
+		modelIds: [model],
+		defaultModelId: model,
+		operations: [{
+			operation: "derive",
+			tool: "generate_video",
+			description: "Create an Avatar video from one portrait image and one audio Variant.",
+			inputs: [
+				SPACE_INPUT,
+				fixedInput("generator_id", `video/${model}`, "Selects this Avatar generator."),
+				NAME_INPUT,
+				input("asset_type", "string", true, "Asset classification stored in the Space."),
+				input("prompt", "string", false, "Optional motion and expression guidance."),
+				...parameters,
+				input("image_reference_variant_refs", "string_array", true, "Exactly one completed portrait image Variant.", {
+					minItems: 1,
+					maxItems: 1
+				}),
+				input("audio_reference_variant_refs", "string_array", true, "Exactly one completed audio Variant.", {
+					minItems: 1,
+					maxItems: 1
+				})
+			]
+		}],
+		referenceRules: {
+			mediaKind: null,
+			completedOnly: true,
+			maxCount: 2,
+			maxTotalCount: 2,
+			modalities: [{
+				mediaKind: "image",
+				minCount: 1,
+				maxCount: 1,
+				promptLabel: "Portrait",
+				acceptedMimeTypes: [
+					"image/jpeg",
+					"image/png",
+					"image/webp"
+				],
+				maxBytesPerFile: 10 * 1024 * 1024
+			}, {
+				mediaKind: "audio",
+				minCount: 1,
+				maxCount: 1,
+				promptLabel: "Audio",
+				acceptedMimeTypes: [
+					"audio/mpeg",
+					"audio/wav",
+					"audio/x-wav",
+					"audio/mp4",
+					"audio/aac"
+				],
+				maxBytesPerFile: 5 * 1024 * 1024
+			}]
+		},
+		notes: ["Outputs an ordinary video Variant. Provider routing remains internal."]
+	};
+}
 function audioGenerator(input_) {
 	const inputs = [
 		SPACE_INPUT,
@@ -8758,7 +8986,6 @@ function audioGenerator(input_) {
 		id: input_.id,
 		label: input_.label,
 		mediaKind: "audio",
-		provider: input_.provider,
 		modelIds: [input_.modelId],
 		defaultModelId: input_.modelId,
 		operations: [{
@@ -8784,6 +9011,7 @@ function getGeneratorCatalog(overrides = {}) {
 		...Object.values(IMAGE_MODEL_CAPABILITIES).map(imageGenerator),
 		...VIDEO_MODEL_SELECTIONS.map(videoGenerator),
 		...SEEDANCE_2_SELECTIONS.map((selection) => seedanceVideoGenerator(SEEDANCE_2_CAPABILITIES[selection])),
+		...AVATAR_MODEL_IDS.map(avatarVideoGenerator),
 		audioGenerator({
 			id: "audio/elevenlabs-speech",
 			label: "ElevenLabs Speech",
@@ -8863,6 +9091,11 @@ var DRAFT_RECIPE_INPUT_KEYS = {
 	duration: "seedanceDuration",
 	bitrate_mode: "seedanceBitrateMode"
 };
+function draftRecipeInputKey(inputName, generatorId) {
+	if (generatorId === "video/p-video-avatar" && inputName === "resolution") return "avatarResolution";
+	if (generatorId === "video/kling-avatar-v2" && inputName === "mode") return "avatarMode";
+	return DRAFT_RECIPE_INPUT_KEYS[inputName];
+}
 var DRAFT_REFERENCE_FIELD = /(?:_variant_refs?|VariantRefs?)$/;
 /**
 * The one slot-naming convention used while authoring and resolving Bindings.
@@ -8883,6 +9116,7 @@ function generatorIdForDraftRecipe(mediaMode, recipe) {
 	}
 	if (mediaMode === "video") {
 		const model = typeof recipe.model === "string" ? recipe.model : "veo-3.1";
+		if (isAvatarModelId(model)) return `video/${model}`;
 		const seedance = getSeedance2CapabilityByEndpoint(model);
 		if (seedance) return seedance.generatorId;
 		const selection = getVideoModelSelectionForModel(model);
@@ -8905,7 +9139,7 @@ function buildDraftMapping(args) {
 	if (!operationDefinition) throw new Error(`${generatorId} does not support ${operation} drafts`);
 	const recipeTemplate = { operation };
 	for (const input of operationDefinition.inputs) {
-		const key = DRAFT_RECIPE_INPUT_KEYS[input.name];
+		const key = draftRecipeInputKey(input.name, generatorId);
 		if (!key) continue;
 		const value = recipe[key];
 		if (value !== void 0) recipeTemplate[key] = value;
@@ -10094,7 +10328,7 @@ async function executeModels(parsed, deps = defaultDeps$5) {
 		const { models } = await response.json();
 		if (parsed.options.json === "true") deps.print(JSON.stringify(models, null, 2));
 		else for (const model of models) {
-			const readiness = model.availability.available ? "ready" : model.availability.reason ?? "unavailable";
+			const readiness = model.availability.available ? "ready" : [model.availability.code, model.availability.reason].filter(Boolean).join(": ") || "unavailable";
 			deps.print(`${model.id.padEnd(20)} ${model.media_kind.padEnd(6)} ${readiness}`);
 		}
 		return models;
@@ -10117,6 +10351,7 @@ function formatModelDetail(model) {
 		`Availability: ${model.availability.available ? "ready" : model.availability.reason ?? "unavailable"}`,
 		"Operations:"
 	];
+	if (!model.availability.available && model.availability.guidance) lines.splice(3, 0, `Next step: ${model.availability.guidance}`);
 	for (const operation of model.operations) {
 		if (typeof operation === "string") {
 			lines.push(`  - ${operation}`);
@@ -11253,6 +11488,8 @@ var HELP = {
       [--refs <variant-ref-or-file,...>] [--first-frame <ref>] [--last-frame <ref>] [--image-refs <refs>] [--video-refs <refs>] [--audio-refs <refs>]
       [--aspect <ratio>] [--resolution 480p|720p|1080p|4k] [--duration <seconds|auto>] [--tier generate|fast|lite] [--bitrate standard|high]
       [--audio | --no-audio] [--collection <id>] [--space <id>]
+  makefx video generate ["prompt"] --model kling-avatar-v2 --image-refs <portrait-ref> --audio-refs <audio-ref>
+      --name <name> --type <type> -o <file> [--mode standard|pro] [--collection <id>] [--space <id>]
   makefx video regenerate <variant-ref> ["prompt"] [--model <model>] [--aspect <ratio>] [--resolution <value>] [--duration <seconds>] [--tier <tier>] [--bitrate standard|high] [--audio | --no-audio] [--image-refs <refs>] [--video-refs <refs>] [--audio-refs <refs>] [--no-activate] [--wait]
 
 Seedance mode is inferred: first/last frame selects frame mode, image/video/audio refs select reference mode, and no references selects text mode.`,
@@ -11333,7 +11570,6 @@ compact variant refs, each optionally suffixed :derived, :refined, or :forked
 };
 //#endregion
 //#region src/cli/index.ts
-var CLI_VERSION = "1.5.0+27ffb5049678";
 function printHelp() {
 	console.log(TOP_LEVEL_HELP);
 }

package/package.json

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