makefx 0.2.1 → 0.2.2

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: 0.2.1
+Version: 0.2.2

package/makefx.mjs

@@ -5111,7 +5111,7 @@ async function executeUpload(parsed, deps = defaultDeps$11) {
 	const provider = parsed.options.provider;
 	const rawProviderMetadata = parsed.options["provider-metadata"] ?? parsed.options.providerMetadata ?? parsed.options.provider_metadata;
 	const rawGenerationProvenance = parsed.options["generation-provenance"] ?? parsed.options.generationProvenance ?? parsed.options.generation_provenance;
-	const sourceVariantId = parsed.options["source-variant"] ?? parsed.options.sourceVariantId ?? parsed.options.parentVariantId;
+	const rawSourceVariantIds = parsed.options["source-variants"] ?? parsed.options.sourceVariants ?? parsed.options.sourceVariantIds ?? parsed.options["source-variant"] ?? parsed.options.sourceVariantId ?? parsed.options.parentVariantId;
 	const rawRelationType = parsed.options["relation-type"] ?? parsed.options.relationType;
 	const rawActiveVariantBehavior = parsed.options["active-variant-behavior"] ?? parsed.options.activeVariantBehavior;
 	const rawCollectionIds = parsed.options.collection ?? parsed.options.collections;
@@ -5128,11 +5128,12 @@ async function executeUpload(parsed, deps = defaultDeps$11) {
 	if (parsed.options["dry-run"] === "true" || parsed.options.dryRun === "true") throw new UploadUsageError("--dry-run is not supported for direct file upload");
 	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");
-	if (!sourceVariantId && (parsed.options["relation-type"] || parsed.options.relationType)) throw new UploadUsageError("--relation-type requires --source-variant");
 	const providerMetadata = parseJsonObjectOption(rawProviderMetadata, "--provider-metadata");
 	const generationProvenance = parseJsonObjectOption(rawGenerationProvenance, "--generation-provenance");
+	const sourceVariantIds = parseCsvOption$1(rawSourceVariantIds, "--source-variant");
 	const relationType = normalizeRelationType(rawRelationType);
 	const activeVariantBehavior = normalizeActiveVariantBehavior(rawActiveVariantBehavior);
+	if (sourceVariantIds.length === 0 && (parsed.options["relation-type"] || parsed.options.relationType)) throw new UploadUsageError("--relation-type requires --source-variant or --source-variants");
 	const collectionPlacements = parseCollectionPlacements({
 		collectionIds: rawCollectionIds,
 		collectionNames: rawCollectionNames,
@@ -5165,7 +5166,7 @@ async function executeUpload(parsed, deps = defaultDeps$11) {
 		if (fileStat.size > 10485760) throw new Error(`File too large (${(fileStat.size / 1024 / 1024).toFixed(2)}MB). Maximum size: 10MB`);
 		await preflightUploadOrganization(ctx, deps, {
 			assetId,
-			sourceVariantId,
+			sourceVariantIds,
 			collectionPlacements,
 			manualRelations
 		});
@@ -5186,16 +5187,17 @@ async function executeUpload(parsed, deps = defaultDeps$11) {
 		if (provider) formData.append("provider", provider);
 		if (providerMetadata) formData.append("providerMetadata", JSON.stringify(providerMetadata));
 		if (generationProvenance) formData.append("generationProvenance", JSON.stringify(generationProvenance));
-		if (sourceVariantId) formData.append("lineage", JSON.stringify([{
-			parentVariantId: sourceVariantId,
+		if (sourceVariantIds.length > 0) formData.append("lineage", JSON.stringify(sourceVariantIds.map((parentVariantId) => ({
+			parentVariantId,
 			relationType
-		}]));
+		}))));
 		if (!jsonOutput) {
 			deps.print(`\nUploading "${fileName}" to space ${spaceId}...`);
 			deps.print(`  Media kind: ${mediaType.mediaKind}`);
 			if (assetId) deps.print(`  Target asset: ${assetId}`);
 			else deps.print(`  Creating asset: "${assetName}" (${assetType})`);
-			if (sourceVariantId) deps.print(`  Source variant: ${sourceVariantId} (${relationType})`);
+			if (sourceVariantIds.length === 1) deps.print(`  Source variant: ${sourceVariantIds[0]} (${relationType})`);
+			else if (sourceVariantIds.length > 1) deps.print(`  Source variants: ${sourceVariantIds.join(", ")} (${relationType})`);
 		}
 		const response = await deps.fetch(`${baseUrl}/api/spaces/${spaceId}/upload`, {
 			method: "POST",
@@ -5372,7 +5374,7 @@ function parseManualRelations(input) {
 }
 async function preflightUploadOrganization(ctx, deps, options) {
 	const needsCollections = options.collectionPlacements.length > 0;
-	const needsAssetState = Boolean(options.sourceVariantId) || options.manualRelations.length > 0 || options.collectionPlacements.some((placement) => placement.pinnedVariantId);
+	const needsAssetState = options.sourceVariantIds.length > 0 || options.manualRelations.length > 0 || options.collectionPlacements.some((placement) => placement.pinnedVariantId);
 	const [collections, state] = await Promise.all([needsCollections ? fetchJson$1(ctx, deps, `/api/spaces/${ctx.spaceId}/collections`) : void 0, needsAssetState ? fetchAssetState(ctx, deps) : void 0]);
 	if (collections) {
 		const collectionList = collections.collections ?? [];
@@ -5387,7 +5389,7 @@ async function preflightUploadOrganization(ctx, deps, options) {
 		}
 	}
 	if (!state) return;
-	if (options.sourceVariantId && !state.variantsById.has(options.sourceVariantId)) throw new Error(`Source variant not found in space: ${options.sourceVariantId}`);
+	for (const sourceVariantId of options.sourceVariantIds) if (!state.variantsById.has(sourceVariantId)) throw new Error(`Source variant not found in space: ${sourceVariantId}`);
 	for (const placement of options.collectionPlacements) {
 		if (!placement.pinnedVariantId) continue;
 		const pinned = state.variantsById.get(placement.pinnedVariantId);
@@ -5500,7 +5502,8 @@ Options:
   --provider <name> Provider provenance for uploaded media
   --provider-metadata <json>     Provider metadata JSON object
   --generation-provenance <json> Extra provenance JSON object
-  --source-variant <id>          Existing source variant for upload lineage
+  --source-variant <ids>         Comma-separated source variants for upload lineage
+  --source-variants <ids>        Alias for --source-variant
   --relation-type <type>         Lineage type: derived, refined, or forked (default: derived)
   --active-variant-behavior <b>  if-missing, set-active, or keep
   --collection <ids>             Comma-separated collection IDs for the uploaded asset or variant
@@ -5525,6 +5528,7 @@ Examples:
   makefx upload hero.png --space abc123 --name "Hero Character"
   makefx upload hero.png --space abc123 --name "Hero" --prompt "external render" --provider blender
   makefx upload paintover.png --space abc123 --asset def456 --source-variant var123 --relation-type refined
+  makefx upload scene.png --space abc123 --name "Cocina" --type scene --source-variants anna,roman,bg
   makefx upload hero.png --space abc123 --name "Hero" --collection collection_cast --collection-role character
   makefx upload hero.png --space abc123 --name "Hero" --collection-name "Cast" --collection-role character
   makefx upload thumbnail.png --space abc123 --asset asset_thumb --manual-relation thumbnail_for:asset:asset_target
@@ -19471,6 +19475,7 @@ var UserProfileSchema = object({
 var SessionConfigSchema = object({
 	googleClientId: string$1(),
 	environment: string$1(),
+	mediaCdnBaseUrl: string$1().nullable().optional(),
 	features: object({ rotation: boolean$1() })
 }).openapi("SessionConfig");
 var AuthSessionResponseSchema = object({
@@ -25717,7 +25722,7 @@ Options:
 }
 //#endregion
 //#region src/cli/index.ts
-var CLI_VERSION = "0.2.1+2f99bf2b725b";
+var CLI_VERSION = "0.2.2+eac63fce1aba";
 async function main() {
 	const argv = process$1.argv.slice(2);
 	if (argv[0] === "--") argv.shift();
@@ -26079,7 +26084,8 @@ Options:
   --provider <name> Provider provenance for uploaded media
   --provider-metadata <json>     Provider metadata JSON object
   --generation-provenance <json> Extra provenance JSON object
-  --source-variant <id>          Existing source variant for upload lineage
+  --source-variant <ids>         Comma-separated source variants for upload lineage
+  --source-variants <ids>        Alias for --source-variant
   --relation-type <type>         Lineage type: derived, refined, or forked (default: derived)
   --active-variant-behavior <b>  if-missing, set-active, or keep
   --collection <ids>             Comma-separated collection IDs for the uploaded asset or variant

package/package.json

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