makefx 1.6.8 → 1.6.10

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.6.8
+Version: 1.6.10

package/makefx.mjs

@@ -198,6 +198,24 @@ function loginCommandForEnvironment(environment) {
 	if (environment === "local") return "makefx login --local";
 	return `makefx login --env ${environment}`;
 }
+//#endregion
+//#region src/cli/lib/http-response.ts
+var MAX_ERROR_BODY_LENGTH = 500;
+function boundedBody(body) {
+	const trimmed = body.trim();
+	if (trimmed.length <= MAX_ERROR_BODY_LENGTH) return trimmed;
+	return `${trimmed.slice(0, MAX_ERROR_BODY_LENGTH)}…`;
+}
+async function readJsonResponse(response, description) {
+	const contentType = response.headers.get("content-type") ?? "unknown";
+	const body = await response.text();
+	try {
+		return JSON.parse(body);
+	} catch {
+		const detail = boundedBody(body);
+		throw new Error(`${description} returned non-JSON (HTTP ${response.status}; content-type: ${contentType})${detail ? `: ${detail}` : ""}`);
+	}
+}
 var EXT_TO_MEDIA_TYPE = {
 	".aac": {
 		mediaKind: "audio",
@@ -301,7 +319,7 @@ async function uploadLocalMediaAsReference(input) {
 		headers: { "Authorization": `Bearer ${input.accessToken}` },
 		body: formData
 	});
-	const data = await response.json();
+	const data = await readJsonResponse(response, "Reference upload request");
 	if (!response.ok || !data.success || !data.variant) throw new Error(`Failed to upload reference "${input.filePath}": ${data.error || response.statusText}`);
 	return {
 		asset: data.asset,
@@ -4442,7 +4460,7 @@ require_websocket_server();
 var wrapper_default = import_websocket.default;
 //#endregion
 //#region src/cli/version.ts
-var CLI_VERSION = "1.6.8+06570e7d00c2";
+var CLI_VERSION = "1.6.10+f750440f39c4";
 var CLI_VERSION_HEADER = "X-MakeFX-CLI-Version";
 function cliVersionHeaders() {
 	return {
@@ -4720,7 +4738,6 @@ var WebSocketClient = class WebSocketClient {
 				this.onSyncState?.({
 					assets: syncMsg.assets,
 					variants: syncMsg.variants,
-					lineage: syncMsg.lineage,
 					collections: syncMsg.collections,
 					collectionItems: syncMsg.collectionItems,
 					canvasSettings: syncMsg.canvasSettings,
@@ -5789,7 +5806,7 @@ function printAssetSearchResults(results, print) {
 	}
 }
 function printAssetDetails(details, ctx, print) {
-	const { asset, variants, lineage } = details;
+	const { asset, variants, recipe_references: recipeReferences } = details;
 	print(`\nAsset ${createAssetRef(asset.name, asset.id)}\n`);
 	print(`  Name:     ${asset.name}`);
 	print(`  Type:     ${asset.type || "unknown"}`);
@@ -5804,17 +5821,24 @@ function printAssetDetails(details, ctx, print) {
 			print(`     Status: ${variant.status}`);
 			print(`     Media:  ${variant.media_kind || "-"}`);
 			if (variant.media_mime_type) print(`     MIME:   ${variant.media_mime_type}`);
-			const provenance = formatMetadataSummary(variant.generation_provenance, [
-				"operation",
-				"assetType",
-				"mediaKind",
-				"model",
-				"prompt"
-			]);
-			if (provenance) print(`     Provenance: ${provenance}`);
+			const detail = recipeReferences.variants.find((candidate) => candidate.variant_id === variant.id);
+			if (detail) {
+				print(`     Recipe: ${detail.recipe_state.status}; ${detail.recipe_state.replayability.replace("_", " ")}`);
+				const generator = detail.recipe?.generator;
+				const execution = detail.recipe?.execution;
+				const parameters = generator?.parameters;
+				if (generator?.id) print(`     Generator: ${String(generator.id)}`);
+				if (execution?.provider) print(`     Provider: ${String(execution.provider)}`);
+				if (execution?.model) print(`     Model: ${String(execution.model)}`);
+				if (parameters?.prompt !== void 0) print(`     Prompt: ${String(parameters.prompt)}`);
+				if (detail.made_from.length > 0) for (const reference of detail.made_from) print(`     Reference[${reference.sequence_index}] ${reference.slot}: ${formatRecipeReferenceTarget(reference)}`);
+				print(`     Views: made_from=${detail.made_from.length} used_by=${detail.used_by_total}${detail.used_by_truncated ? "+" : ""}`);
+			}
 		}
 	}
-	if (lineage.length > 0) print(`\nLineage links: ${lineage.length}`);
+}
+function formatRecipeReferenceTarget(target) {
+	return target.available && target.asset_id && target.asset_name ? createVariantRef(target.asset_name, target.asset_id, target.variant_id) : `unresolved:${target.variant_id}`;
 }
 function toAssetJson(asset) {
 	return {
@@ -5840,29 +5864,41 @@ function toAssetDetailsJson(details) {
 			createdAt: variant.created_at || null,
 			updatedAt: variant.updated_at || null
 		})),
-		lineageCount: details.lineage.length
+		recipeReferences: details.recipe_references.variants.map((detail) => ({
+			variantRef: createVariantRef(details.asset.name, details.asset.id, detail.variant_id),
+			recipe: publicCliRecipe(detail.recipe),
+			recipeState: {
+				status: detail.recipe_state.status,
+				replayability: detail.recipe_state.replayability,
+				issues: detail.recipe_state.issues,
+				replayabilityIssues: detail.recipe_state.replayability_issues
+			},
+			references: detail.made_from.map((reference) => ({
+				variantRef: reference.available && reference.asset_id && reference.asset_name ? createVariantRef(reference.asset_name, reference.asset_id, reference.variant_id) : null,
+				...!reference.available ? { historicalVariantId: reference.variant_id } : {},
+				slot: reference.slot,
+				sequenceIndex: reference.sequence_index,
+				modalityIndex: reference.modality_index,
+				mediaKind: reference.media_kind,
+				mimeType: reference.mime_type,
+				sizeBytes: reference.size_bytes,
+				width: reference.width,
+				height: reference.height,
+				durationMs: reference.duration_ms
+			})),
+			madeFrom: detail.made_from.map(formatRecipeReferenceTarget),
+			usedBy: detail.used_by.map(formatRecipeReferenceTarget),
+			usedByTotal: detail.used_by_total,
+			usedByTruncated: detail.used_by_truncated
+		})),
+		totalVariantCount: details.recipe_references.total_variant_count,
+		truncated: details.recipe_references.truncated
 	};
 }
-function formatMetadataSummary(value, preferredKeys) {
-	if (!value) return null;
-	const parsed = parseJsonObject(value);
-	if (!parsed) return truncate(value, 120);
-	const parts = [];
-	for (const key of preferredKeys) {
-		const field = parsed[key];
-		if (field === void 0 || field === null || typeof field === "object") continue;
-		parts.push(`${key}=${String(field)}`);
-	}
-	return parts.length > 0 ? truncate(parts.join(" "), 160) : truncate(JSON.stringify(parsed), 160);
-}
-function parseJsonObject(value) {
-	try {
-		const parsed = JSON.parse(value);
-		if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) return parsed;
-	} catch {
-		return null;
-	}
-	return null;
+function publicCliRecipe(recipe) {
+	if (!recipe) return null;
+	const { references: _references, regeneration: _regeneration, copiedFromVariantId: _copiedFromVariantId, ...publicRecipe } = recipe;
+	return publicRecipe;
 }
 function formatTimestamp(value) {
 	if (!value) return "-";
@@ -9327,6 +9363,17 @@ async function executeSpaceLens(parsed, deps = defaultDeps$8) {
 	return result;
 }
 IMAGE_MODEL_SELECTIONS.map((selection) => `image/${selection}`);
+function referenceSlot(slot, mediaKind, minCount, maxCount, providerPosition, requiredMetadata = []) {
+	return {
+		slot,
+		mediaKinds: [mediaKind],
+		minCount,
+		maxCount,
+		providerPosition,
+		ordering: "preserve_occurrence_order",
+		...requiredMetadata.length ? { requiredMetadata } : {}
+	};
+}
 function input(name, type, required, description, options = {}) {
 	return {
 		name,
@@ -9371,7 +9418,12 @@ function imageGenerator(capability) {
 		operation: "generate",
 		tool: "generate_image",
 		description: "Create a new image asset from text.",
-		inputs: generateInputs
+		inputs: generateInputs,
+		referenceSlots: [],
+		referenceCardinality: {
+			minCount: 0,
+			maxCount: 0
+		}
 	}];
 	if (capability.supportedOperations.includes("derive")) operations.push({
 		operation: "derive",
@@ -9380,7 +9432,12 @@ function imageGenerator(capability) {
 		inputs: [...generateInputs, {
 			...referenceInput,
 			required: true
-		}]
+		}],
+		referenceSlots: [referenceSlot("reference_variant_refs", "image", 1, capability.maxReferenceImages, 0)],
+		referenceCardinality: {
+			minCount: 1,
+			maxCount: capability.maxReferenceImages
+		}
 	});
 	if (capability.supportedOperations.includes("refine")) operations.push({
 		operation: "refine",
@@ -9409,7 +9466,12 @@ function imageGenerator(capability) {
 				defaultValue: "medium"
 			})] : [],
 			...capability.supportsSeed ? [input("seed", "integer", false, "Optional reproducible generation seed.")] : []
-		]
+		],
+		referenceSlots: [referenceSlot("source_variant_ref", "image", 1, 1, 0), referenceSlot("reference_variant_refs", "image", 0, Math.max(0, capability.maxReferenceImages - 1), 1)],
+		referenceCardinality: {
+			minCount: 1,
+			maxCount: capability.maxReferenceImages
+		}
 	});
 	return {
 		id: `image/${capability.selection}`,
@@ -9426,6 +9488,72 @@ function imageGenerator(capability) {
 		notes: capability.maxReferenceImages > 0 ? ["Use compact variant references; binary image input is not accepted."] : ["Text-to-image only; reference inputs are not supported."]
 	};
 }
+function customImageGenerator(modelId) {
+	const common = [
+		SPACE_INPUT,
+		fixedInput("generator_id", "image/custom", "Selects the configured custom image generator."),
+		NAME_INPUT,
+		input("asset_type", "string", true, "Asset classification stored in the Space."),
+		PROMPT_INPUT,
+		input("aspect_ratio", "string", false, "Output aspect ratio."),
+		input("image_size", "string", false, "Output image size.")
+	];
+	const referenceInput = input("reference_variant_refs", "string_array", false, "Ordered image references.", {
+		minItems: 1,
+		maxItems: 14
+	});
+	return {
+		id: "image/custom",
+		label: "Custom image",
+		mediaKind: "image",
+		modelIds: [modelId],
+		defaultModelId: modelId,
+		operations: [
+			{
+				operation: "generate",
+				tool: "generate_image",
+				description: "Generate with the configured custom model.",
+				inputs: common,
+				referenceSlots: [],
+				referenceCardinality: {
+					minCount: 0,
+					maxCount: 0
+				}
+			},
+			{
+				operation: "derive",
+				tool: "generate_image",
+				description: "Generate with ordered image references.",
+				inputs: [...common, {
+					...referenceInput,
+					required: true
+				}],
+				referenceSlots: [referenceSlot("reference_variant_refs", "image", 1, 14, 0)],
+				referenceCardinality: {
+					minCount: 1,
+					maxCount: 14
+				}
+			},
+			{
+				operation: "refine",
+				tool: "edit_image",
+				description: "Edit a source image.",
+				inputs: [...common, input("source_variant_ref", "string", true, "Source image.")],
+				referenceSlots: [referenceSlot("source_variant_ref", "image", 1, 1, 0)],
+				referenceCardinality: {
+					minCount: 1,
+					maxCount: 1
+				}
+			}
+		],
+		referenceRules: {
+			mediaKind: "image",
+			completedOnly: true,
+			maxCount: 14
+		},
+		notes: ["The configured custom endpoint owns model-specific parameter support."]
+	};
+}
 function videoGenerator(selection) {
 	const defaultModel = getVideoGenerationModelForSelection(selection);
 	const isVeo = selection === "veo-3.1";
@@ -9449,7 +9577,7 @@ function videoGenerator(selection) {
 		allowedValues: VIDEO_GENERATION_TIERS,
 		defaultValue: DEFAULT_VIDEO_GENERATION_TIER
 	}));
-	if (isKling) parameterInputs.push(input("generate_audio", "boolean", false, "Generate synchronized audio.", {
+	if (isKling || isVeo) parameterInputs.push(input("generate_audio", "boolean", false, "Generate synchronized audio.", {
 		allowedValues: [true, false],
 		defaultValue: true
 	}));
@@ -9465,7 +9593,12 @@ function videoGenerator(selection) {
 		operation: "generate",
 		tool: "generate_video",
 		description: "Create a new video asset from text.",
-		inputs: commonInputs
+		inputs: commonInputs,
+		referenceSlots: [],
+		referenceCardinality: {
+			minCount: 0,
+			maxCount: 0
+		}
 	}];
 	if (VIDEO_MODEL_SUPPORTED_OPERATIONS[selection].includes("refine")) operations.push({
 		operation: "refine",
@@ -9478,7 +9611,12 @@ function videoGenerator(selection) {
 			input("source_variant_ref", "string", true, "Completed video variant to refine."),
 			PROMPT_INPUT,
 			...parameterInputs
-		]
+		],
+		referenceSlots: [referenceSlot("source_variant_ref", "video", 1, 1, 0)],
+		referenceCardinality: {
+			minCount: 1,
+			maxCount: 1
+		}
 	});
 	if (VIDEO_MODEL_SUPPORTED_OPERATIONS[selection].includes("derive")) operations.push({
 		operation: "derive",
@@ -9487,9 +9625,14 @@ function videoGenerator(selection) {
 		inputs: [...commonInputs, input("reference_variant_refs", "string_array", true, "Completed image variant references from find_assets or get_asset.", {
 			minItems: 1,
 			maxItems: maxReferences
-		})]
+		})],
+		referenceSlots: [referenceSlot("reference_variant_refs", "image", 1, maxReferences, 0)],
+		referenceCardinality: {
+			minCount: 1,
+			maxCount: maxReferences
+		}
 	});
-	const notes = isVeo ? [`Resolution support by tier: ${VIDEO_GENERATION_TIERS.map((tier) => `${tier}=${VIDEO_GENERATION_RESOLUTIONS_BY_TIER[tier].join("/")}`).join(", ")}.`, "Synchronized audio is always enabled."] : isOmni ? ["Resolution, duration, tier, and generated-audio options are not accepted."] : selection === "fal-seedance" ? ["Text-to-video only; generated audio is not supported."] : ["At most one completed image reference is accepted."];
+	const notes = isVeo ? [`Resolution support by tier: ${VIDEO_GENERATION_TIERS.map((tier) => `${tier}=${VIDEO_GENERATION_RESOLUTIONS_BY_TIER[tier].join("/")}`).join(", ")}.`] : isOmni ? ["Resolution, duration, tier, and generated-audio options are not accepted."] : selection === "fal-seedance" ? ["Text-to-video only; generated audio is not supported."] : ["At most one completed image reference is accepted."];
 	return {
 		id: `video/${selection}`,
 		label: VIDEO_MODEL_LABELS[selection],
@@ -9561,7 +9704,22 @@ function seedanceVideoGenerator(capability) {
 		operation,
 		tool: "generate_video",
 		description: capability.mode === "text" ? "Create a video from text." : capability.mode === "frame" ? "Animate a required authoritative start frame and optional authoritative end frame; extended references cannot be combined with them." : "Direct a video with ordered image, video, and audio references; these guide generation but cannot serve as authoritative start/end frames.",
-		inputs: [...common, ...modeInputs]
+		inputs: [...common, ...modeInputs],
+		referenceSlots: capability.mode === "frame" ? [referenceSlot("start_frame_variant_ref", "image", 1, 1, 0), referenceSlot("end_frame_variant_ref", "image", 0, 1, 1)] : capability.mode === "reference" ? [
+			referenceSlot("image_reference_variant_refs", "image", 0, referenceMax("image"), 0, ["mimeType", "sizeBytes"]),
+			referenceSlot("video_reference_variant_refs", "video", 0, referenceMax("video"), 1, ["mimeType", "sizeBytes"]),
+			referenceSlot("audio_reference_variant_refs", "audio", 0, referenceMax("audio"), 2, ["mimeType", "sizeBytes"])
+		] : [],
+		referenceCardinality: capability.mode === "text" ? {
+			minCount: 0,
+			maxCount: 0
+		} : capability.mode === "frame" ? {
+			minCount: 1,
+			maxCount: 2
+		} : {
+			minCount: operation === "derive" ? 1 : 0,
+			maxCount: capability.maxReferenceFiles
+		}
 	}));
 	if (capability.operations.includes("refine")) {
 		const budget = getSeedance2ReferenceBudget(capability, "refine");
@@ -9587,7 +9745,17 @@ function seedanceVideoGenerator(capability) {
 				PROMPT_INPUT,
 				...parameters,
 				...editReferenceInputs
-			]
+			],
+			referenceSlots: [
+				referenceSlot("source_variant_ref", "video", 1, 1, 0, ["mimeType", "sizeBytes"]),
+				referenceSlot("image_reference_variant_refs", "image", 0, budget.maxAdditionalByKind.image, 1, ["mimeType", "sizeBytes"]),
+				referenceSlot("video_reference_variant_refs", "video", 0, budget.maxAdditionalByKind.video, 2, ["mimeType", "sizeBytes"]),
+				referenceSlot("audio_reference_variant_refs", "audio", 0, budget.maxAdditionalByKind.audio, 3, ["mimeType", "sizeBytes"])
+			],
+			referenceCardinality: {
+				minCount: 1,
+				maxCount: capability.maxReferenceFiles
+			}
 		});
 	}
 	return {
@@ -9610,8 +9778,7 @@ function seedanceVideoGenerator(capability) {
 				promptLabel: reference.promptLabel,
 				acceptedMimeTypes: reference.acceptedMimeTypes,
 				maxBytesPerFile: reference.maxBytesPerFile,
-				...reference.combinedMaxBytes !== void 0 ? { combinedMaxBytes: reference.combinedMaxBytes } : {},
-				...reference.combinedDurationSeconds ? { combinedDurationSeconds: reference.combinedDurationSeconds } : {}
+				...reference.combinedMaxBytes !== void 0 ? { combinedMaxBytes: reference.combinedMaxBytes } : {}
 			}))
 		},
 		notes: [
@@ -9682,7 +9849,30 @@ function wan3VideoGenerator(capability) {
 		operation: capability.mode === "text" ? "generate" : "derive",
 		tool: "generate_video",
 		description: capability.mode === "text" ? "Create a native-audio video from text." : capability.mode === "frame" ? "Animate a start frame and optional end frame." : "Direct one video from up to 20 ordered image, video, and audio references.",
-		inputs: [...common, ...modeInputs]
+		inputs: [...common, ...modeInputs],
+		referenceSlots: capability.mode === "frame" ? [referenceSlot("start_frame_variant_ref", "image", 1, 1, 0), referenceSlot("end_frame_variant_ref", "image", 0, 1, 1)] : capability.mode === "reference" ? [
+			referenceSlot("image_reference_variant_refs", "image", 0, max("image"), 0, ["mimeType", "sizeBytes"]),
+			referenceSlot("video_reference_variant_refs", "video", 0, max("video"), 1, [
+				"mimeType",
+				"sizeBytes",
+				"durationMs"
+			]),
+			referenceSlot("audio_reference_variant_refs", "audio", 0, max("audio"), 2, [
+				"mimeType",
+				"sizeBytes",
+				"durationMs"
+			])
+		] : [],
+		referenceCardinality: capability.mode === "text" ? {
+			minCount: 0,
+			maxCount: 0
+		} : capability.mode === "frame" ? {
+			minCount: 1,
+			maxCount: 2
+		} : {
+			minCount: 1,
+			maxCount: capability.maxReferenceFiles
+		}
 	}];
 	if (capability.mode === "reference") operations.push({
 		operation: "refine",
@@ -9709,7 +9899,29 @@ function wan3VideoGenerator(capability) {
 				maxItems: 4,
 				description: "Up to 4 additional videos; the source video is Video 1."
 			} : item)
-		]
+		],
+		referenceSlots: [
+			referenceSlot("source_variant_ref", "video", 1, 1, 0, [
+				"mimeType",
+				"sizeBytes",
+				"durationMs"
+			]),
+			referenceSlot("image_reference_variant_refs", "image", 0, 10, 1, ["mimeType", "sizeBytes"]),
+			referenceSlot("video_reference_variant_refs", "video", 0, 4, 2, [
+				"mimeType",
+				"sizeBytes",
+				"durationMs"
+			]),
+			referenceSlot("audio_reference_variant_refs", "audio", 0, 5, 3, [
+				"mimeType",
+				"sizeBytes",
+				"durationMs"
+			])
+		],
+		referenceCardinality: {
+			minCount: 1,
+			maxCount: capability.maxReferenceFiles
+		}
 	});
 	return {
 		id: capability.generatorId,
@@ -9786,7 +9998,12 @@ function avatarVideoGenerator(model) {
 					minItems: 1,
 					maxItems: 1
 				})
-			]
+			],
+			referenceSlots: [referenceSlot("image_reference_variant_refs", "image", 1, 1, 0, ["mimeType", "sizeBytes"]), referenceSlot("audio_reference_variant_refs", "audio", 1, 1, 1, ["mimeType", "sizeBytes"])],
+			referenceCardinality: {
+				minCount: 2,
+				maxCount: 2
+			}
 		}],
 		referenceRules: {
 			mediaKind: null,
@@ -9837,13 +10054,18 @@ function audioGenerator(input_) {
 		id: input_.id,
 		label: input_.label,
 		mediaKind: "audio",
-		modelIds: [input_.modelId],
+		modelIds: input_.assetType === "speech" || input_.assetType === "dialogue" ? [...new Set([input_.modelId, DEFAULT_ELEVENLABS_SPEECH_MODEL_ID])] : [input_.modelId],
 		defaultModelId: input_.modelId,
 		operations: [{
 			operation: "generate",
 			tool: "generate_audio",
 			description: `Create a new ${input_.assetType} audio asset.`,
-			inputs
+			inputs,
+			referenceSlots: [],
+			referenceCardinality: {
+				minCount: 0,
+				maxCount: 0
+			}
 		}],
 		referenceRules: {
 			mediaKind: null,
@@ -9860,6 +10082,7 @@ function getGeneratorCatalog(overrides = {}) {
 	const lyria = overrides.lyria ?? "lyria-3-clip-preview";
 	return [
 		...Object.values(IMAGE_MODEL_CAPABILITIES).map(imageGenerator),
+		...overrides.customImage ? [customImageGenerator(overrides.customImage)] : [],
 		...VIDEO_MODEL_SELECTIONS.filter((selection) => !getWan3CapabilityBySelection(selection)).map(videoGenerator),
 		...SEEDANCE_2_SELECTIONS.map((selection) => seedanceVideoGenerator(SEEDANCE_2_CAPABILITIES[selection])),
 		...WAN_3_CAPABILITIES.map(wan3VideoGenerator),
@@ -9906,6 +10129,15 @@ function getGeneratorDefinition(id, overrides = {}) {
 }
 //#endregion
 //#region src/shared/generationReferences.ts
+var GENERATION_REFERENCE_SLOTS = [
+	"source_variant_ref",
+	"reference_variant_refs",
+	"start_frame_variant_ref",
+	"end_frame_variant_ref",
+	"image_reference_variant_refs",
+	"video_reference_variant_refs",
+	"audio_reference_variant_refs"
+];
 function isGenerationReference(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return false;
 	const reference = value;
@@ -11306,6 +11538,7 @@ function rejectUnknownModelOptions(command, options) {
 var defaultDeps$4 = {
 	loadConfig: loadStoredConfig,
 	resolveBaseUrl,
+	loadProjectConfig,
 	saveProjectConfig,
 	fetch,
 	print: console.log
@@ -11319,10 +11552,12 @@ async function handleSpaces(parsed) {
 	}
 }
 async function executeSpaces(parsed, deps = defaultDeps$4) {
-	const env = resolveCommandEnvironment(parsed);
 	const subcommand = parsed.positionals[0];
 	rejectUnknownSpaceOptions(subcommand, parsed.options);
 	const jsonOutput = parsed.options.json === "true";
+	const projectConfig = subcommand === "current" ? await deps.loadProjectConfig() : null;
+	if (subcommand === "current" && !projectConfig) throw new Error("No current MakeFX Space. Run: makefx init --space <space-id>");
+	const env = resolveCommandEnvironment(parsed, projectConfig);
 	const config = await deps.loadConfig(env);
 	if (!config) throw new Error(`Not logged in to ${env} environment. Run: ${loginCommandForEnvironment(env)}`);
 	if (config.token.expiresAt < Date.now()) throw new Error(`Token expired for ${env} environment. Run: ${loginCommandForEnvironment(env)}`);
@@ -11388,7 +11623,35 @@ async function executeSpaces(parsed, deps = defaultDeps$4) {
 			assets: details.assets
 		};
 	}
-	if (subcommand !== "list") throw new Error("Spaces command is required: list, show, create, or delete");
+	if (subcommand === "current") {
+		const details = await getSpaceDetails(ctx, deps, projectConfig.spaceId);
+		if (jsonOutput) deps.print(JSON.stringify({
+			project: {
+				root: projectConfig.projectRoot ?? null,
+				configPath: projectConfig.configPath ?? null,
+				environment: env
+			},
+			space: publicSpace(details.space),
+			assets: details.assets.map((asset) => ({
+				assetRef: createAssetRef(asset.name, asset.id),
+				name: asset.name,
+				type: asset.type,
+				mediaKind: asset.media_kind ?? null,
+				activeVariantRef: asset.active_variant_id ? createVariantRef(asset.name, asset.id, asset.active_variant_id) : null
+			}))
+		}, null, 2));
+		else {
+			deps.print(`Current project: ${projectConfig.projectRoot ?? projectConfig.configPath ?? "unknown"}`);
+			printSpaceDetails(details, deps.print);
+		}
+		return {
+			type: "current",
+			space: details.space,
+			assets: details.assets,
+			projectRoot: projectConfig.projectRoot ?? null
+		};
+	}
+	if (subcommand !== "list") throw new Error("Spaces command is required: current, list, show, create, or delete");
 	const spaces = await fetchSpaces(ctx, deps);
 	if (jsonOutput) deps.print(JSON.stringify(spaces.map(publicSpace), null, 2));
 	else printSpaces(spaces, deps.print);
@@ -11404,6 +11667,7 @@ function rejectUnknownSpaceOptions(subcommand, options) {
 		"json"
 	];
 	const commandOptions = subcommand ? {
+		current: [],
 		list: [],
 		show: [],
 		create: ["name", "init"],
@@ -11740,33 +12004,31 @@ var defaultDeps$2 = {
 	print: console.log
 };
 var UploadUsageError = class extends Error {};
-var LINEAGE_RELATION_TYPES = new Set([
-	"derived",
-	"refined",
-	"forked"
-]);
-function parseLineageOption(raw, defaultRelationType) {
+function parseRecipeReferencesOption(raw) {
 	if (!raw) return [];
 	const entries = raw.split(",").map((entry) => entry.trim()).filter((entry) => entry.length > 0);
-	if (entries.length === 0) throw new UploadUsageError("--lineage requires at least one compact variant ref");
+	if (entries.length === 0) throw new UploadUsageError("--reference requires at least one slot=variant-ref entry");
 	return entries.map((entry) => {
-		const atIndex = entry.lastIndexOf("@");
-		const separator = entry.lastIndexOf(":");
-		let ref = entry;
-		let relationType = defaultRelationType;
-		if (atIndex !== -1 && separator > atIndex) {
-			const suffix = entry.slice(separator + 1);
-			if (!LINEAGE_RELATION_TYPES.has(suffix)) throw new UploadUsageError(`--lineage relation in "${entry}" must be derived, refined, or forked`);
-			ref = entry.slice(0, separator);
-			relationType = suffix;
-		}
-		if (!ref.startsWith("asset:")) throw new UploadUsageError(`--lineage requires compact variant refs, got "${ref}"`);
+		const separator = entry.indexOf("=");
+		const slot = entry.slice(0, separator);
+		const ref = entry.slice(separator + 1);
+		if (separator <= 0 || !GENERATION_REFERENCE_SLOTS.includes(slot)) throw new UploadUsageError(`--reference requires a canonical slot before "=", got "${entry}"`);
+		const parsed = parseVariantRef(ref);
+		if (!parsed || parsed.variant === "active") throw new UploadUsageError(`--reference requires an exact compact variant ref, got "${ref}"`);
 		return {
-			ref,
-			relationType
+			slot,
+			ref
 		};
 	});
 }
+function parseParametersOption(raw) {
+	if (!raw) return {};
+	try {
+		const parsed = JSON.parse(raw);
+		if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) return parsed;
+	} catch {}
+	throw new UploadUsageError("--parameters must be a JSON object");
+}
 async function handleUpload(parsed) {
 	try {
 		await executeUpload(parsed);
@@ -11791,7 +12053,8 @@ async function executeUpload(parsed, deps = defaultDeps$2) {
 	const jsonOutput = parsed.options.json === "true";
 	if (!spaceId) throw new UploadUsageError("--space is required, or run: makefx init --space <id>");
 	if (!assetId && !assetName) throw new UploadUsageError("Either --asset or --name is required");
-	const lineageEntries = parseLineageOption(parsed.options.lineage, assetId ? "refined" : "derived");
+	const recipeReferences = parseRecipeReferencesOption(parsed.options.reference);
+	const parameters = parseParametersOption(parsed.options.parameters);
 	const mediaType = resolveMediaType(path.extname(filePath).toLowerCase(), requestedMediaKind);
 	const config = await deps.loadConfig(env);
 	if (!config) throw new Error(`Not logged in to ${env} environment. Run: ${loginCommandForEnvironment(env)}`);
@@ -11799,15 +12062,10 @@ async function executeUpload(parsed, deps = defaultDeps$2) {
 	const baseUrl = deps.resolveBaseUrl(env);
 	const accessToken = config.token.accessToken;
 	const createStateClient = () => (deps.createStateClient ?? defaultDeps$2.createStateClient)(env, spaceId);
-	let lineage = [];
-	if (assetId || lineageEntries.length > 0) {
+	if (assetId) {
 		if (assetId && !assetId.startsWith("asset:")) throw new Error("A compact asset ref is required");
 		const state = await readReferenceSpaceState(createStateClient);
 		if (assetId) assetId = resolveAssetRef(assetId, state.assets);
-		lineage = lineageEntries.map((entry) => ({
-			parentVariantId: resolveVariantRef(entry.ref, state.assets, state.variants),
-			relationType: entry.relationType
-		}));
 	}
 	if (env === "local") process$1.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
 	try {
@@ -11826,20 +12084,34 @@ async function executeUpload(parsed, deps = defaultDeps$2) {
 			formData.append("assetName", assetName);
 			formData.append("assetType", assetType);
 		}
-		if (lineage.length > 0) formData.append("lineage", JSON.stringify(lineage));
+		if (hasExternalRecipeOptions(parsed.options)) {
+			formData.append("operation", "import");
+			if (parsed.options.generator) formData.append("generatorId", parsed.options.generator);
+			if (parsed.options["generator-operation"]) formData.append("generatorOperation", parsed.options["generator-operation"]);
+			if (parsed.options.service) formData.append("service", parsed.options.service);
+			if (parsed.options.provider) formData.append("provider", parsed.options.provider);
+			if (parsed.options.model) formData.append("model", parsed.options.model);
+			if (parsed.options.prompt !== void 0) formData.append("prompt", parsed.options.prompt);
+			if (parsed.options["external-run-id"]) formData.append("externalRunId", parsed.options["external-run-id"]);
+			formData.append("parameters", JSON.stringify(parameters));
+			formData.append("references", JSON.stringify(recipeReferences.map((reference) => ({
+				slot: reference.slot,
+				variantRef: reference.ref
+			}))));
+		}
 		if (!jsonOutput) {
 			deps.print(`\nUploading "${fileName}" to space ${spaceId}...`);
 			deps.print(`  Media kind: ${mediaType.mediaKind}`);
 			if (assetId) deps.print(`  Target asset: ${requestedAssetRef}`);
 			else deps.print(`  Creating asset: "${assetName}" (${assetType})`);
-			for (const entry of lineageEntries) deps.print(`  Lineage: ${entry.relationType} from ${entry.ref}`);
+			for (const entry of recipeReferences) deps.print(`  Recipe Reference: ${entry.slot} = ${entry.ref}`);
 		}
 		const response = await deps.fetch(`${baseUrl}/api/spaces/${spaceId}/upload`, {
 			method: "POST",
 			headers: { "Authorization": `Bearer ${accessToken}` },
 			body: formData
 		});
-		const data = await response.json();
+		const data = await readJsonResponse(response, "Upload request");
 		if (!response.ok) throw new Error(`Upload failed: ${"error" in data ? data.error : response.statusText}`);
 		const upload = data;
 		const result = {
@@ -11866,7 +12138,8 @@ async function executeUpload(parsed, deps = defaultDeps$2) {
 				assetRef: result.assetRef,
 				variantRef: result.variantRef,
 				status: upload.variant.status,
-				mediaKind: upload.variant.media_kind || mediaType.mediaKind
+				mediaKind: upload.variant.media_kind || mediaType.mediaKind,
+				...upload.provenance ? { provenance: upload.provenance } : {}
 			}, null, 2));
 			return result;
 		}
@@ -11883,6 +12156,10 @@ async function executeUpload(parsed, deps = defaultDeps$2) {
 		deps.print(`  Status:   ${upload.variant.status}`);
 		deps.print(`  Media:    ${upload.variant.media_kind || mediaType.mediaKind}`);
 		if (upload.variant.media_mime_type) deps.print(`  MIME:     ${upload.variant.media_mime_type}`);
+		if (upload.provenance) {
+			deps.print(`  Recipe:   ${upload.provenance.state}`);
+			if (upload.provenance.missingReasons.length > 0) deps.print(`  Guidance: ${upload.provenance.missingReasons.join(", ")}`);
+		}
 		deps.print("\nTo inspect:");
 		deps.print(`  makefx variants show ${result.variantRef} --wait --space ${spaceId}`);
 		return result;
@@ -11918,12 +12195,33 @@ function rejectUnknownUploadOptions(options) {
 		"name",
 		"type",
 		"media-kind",
-		"lineage",
-		"json"
+		"json",
+		"generator",
+		"generator-operation",
+		"service",
+		"provider",
+		"model",
+		"prompt",
+		"parameters",
+		"reference",
+		"external-run-id"
 	]);
 	const unknown = Object.keys(options).find((name) => !allowed.has(name));
 	if (unknown) throw new UploadUsageError(`Unknown option: --${unknown}`);
 }
+function hasExternalRecipeOptions(options) {
+	return [
+		"generator",
+		"generator-operation",
+		"service",
+		"provider",
+		"model",
+		"prompt",
+		"parameters",
+		"reference",
+		"external-run-id"
+	].some((name) => options[name] !== void 0);
+}
 function printUsage$2() {
 	console.log(`
 Usage:
@@ -11936,9 +12234,14 @@ Options:
   --name <name>     New asset name (creates asset + variant)
   --type <type>     Asset type for new assets (default: character)
   --media-kind <k>  Optional explicit kind: image, audio, or video
-  --lineage <refs>  Source variant refs this upload was made from, comma-separated,
-                    each optionally suffixed :derived, :refined, or :forked
-                    (default: refined with --asset, derived with --name)
+  --generator <id>  Canonical generator/service schema for an external result
+  --service <id>    External execution service
+  --provider <id>   Exact external provider
+  --model <id>      Exact external model
+  --prompt <text>   Exact submitted prompt
+  --parameters <j>  Additional exact generator parameters as a JSON object
+  --reference <r>   Ordered slot=exact-variant-ref entries, comma-separated
+  --external-run-id <id>  Optional bounded external execution identifier
   --json            Print machine-readable output
   --env <env>       Environment (production|stage|local)
   --local           Shortcut for --env local
@@ -11946,7 +12249,9 @@ Options:
 Examples:
   makefx assets upload hero.png --name "Hero Character"
   makefx assets upload paintover.png --asset asset:hero~27f8f176
-  makefx assets upload paintover.png --asset asset:hero~27f8f176 --lineage asset:hero~27f8f176@active
+  makefx assets upload avatar.mp4 --name "Avatar" --generator avatar --service fal \
+    --provider fal --model avatar-v1 --prompt "Welcome" \
+    --reference image_reference_variant_refs=asset:portrait~27f8@a1,audio_reference_variant_refs=asset:voice~91ab@b2
 `);
 }
 //#endregion
@@ -12372,7 +12677,7 @@ Assets:
   graph run | status | cancel
 
 Workspace:
-  spaces list | show | create | delete | lens
+  spaces current | list | show | create | delete | lens
   init | login | logout
   usage | spend | billing
 
@@ -12424,12 +12729,14 @@ Generate commands also accept [--collection <id>] [--space <id>].`,
   makefx assets show <asset-ref> [--json]
   makefx assets update <asset-ref> [--name <name>] [--type <type>] [--tags <tag,...>]
   makefx assets delete <asset-ref> [--yes]
-  makefx assets upload <file> (--name <name> | --asset <asset-ref>) [--type <type>] [--lineage <variant-ref[:relation],...>]
+  makefx assets upload <file> (--name <name> | --asset <asset-ref>) [--type <type>]
+    [--generator <id> --service <id> --provider <id> --model <id>]
+    [--prompt <text>] [--parameters <json>] [--reference <slot=variant-ref,...>]
   makefx assets download <variant-ref> -o <file>
 
-Upload --lineage records which variants the file was made from: comma-separated
-compact variant refs, each optionally suffixed :derived, :refined, or :forked
-(default: refined when uploading to --asset, derived when creating with --name).`,
+External import options attach the exact canonical Recipe without executing a
+provider or billing generation. --reference accepts ordered canonical slots and
+exact compact Variant refs; raw uploads omit all external Recipe options.`,
 	variants: `Usage:
   makefx variants show <variant-ref> [--wait <seconds>] [--json]
   makefx variants update <variant-ref> [--starred true|false] [--rating approved|rejected|none]
@@ -12461,6 +12768,7 @@ compact variant refs, each optionally suffixed :derived, :refined, or :forked
   makefx bindings set <draft-ref> <slot> --source variant|asset-active|draft-output --ref <ref> [--sort <index>]
   makefx bindings clear <draft-ref> <slot> [--sort <index>]`,
 	spaces: `Usage:
+  makefx spaces current [--json]
   makefx spaces list [--json]
   makefx spaces show <space-id> [--json]
   makefx spaces create "<name>" [--init] [--json]

package/package.json

@@ -1,7 +1,16 @@
 {
   "name": "makefx",
-  "version": "1.6.8",
-  "description": "Command-line interface for AI-assisted game asset production with Make Effects.",
+  "version": "1.6.10",
+  "description": "MakeFX CLI for reproducible image, video, and audio Assets in Make Effects.",
+  "homepage": "https://makefx.app/docs/cli",
+  "keywords": [
+    "makefx",
+    "make-effects",
+    "mcp",
+    "media-generation",
+    "reproducibility",
+    "cli"
+  ],
   "license": "MIT",
   "type": "module",
   "repository": {