makefx 1.6.12 → 1.6.13

package/README.md

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

package/makefx.mjs

@@ -292,7 +292,7 @@ function resolveMediaType(ext, requestedMediaKind) {
 }
 //#endregion
 //#region src/cli/version.ts
-var CLI_VERSION = "1.6.12+2a9af5c5c870";
+var CLI_VERSION = "1.6.13+1b64f349b8b2";
 var CLI_VERSION_HEADER = "X-MakeFX-CLI-Version";
 function cliVersionHeaders() {
 	return {
@@ -4562,6 +4562,26 @@ var WebSocketClient = class WebSocketClient {
 			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);
+			this.ws.once("unexpected-response", (_request, response) => {
+				let responseBody = "";
+				response.setEncoding("utf8");
+				response.on("data", (chunk) => {
+					responseBody = `${responseBody}${chunk}`.slice(0, 16384);
+				});
+				response.on("end", () => {
+					let message = `WebSocket connection rejected (${response.statusCode ?? "unknown status"})`;
+					try {
+						const payload = JSON.parse(responseBody);
+						const detail = typeof payload.message === "string" ? payload.message : typeof payload.error === "string" ? payload.error : null;
+						if (detail) message = detail;
+					} catch {
+						if (responseBody.trim()) message = responseBody.trim();
+					}
+					const error = new Error(message);
+					this.onError?.(error);
+					reject(error);
+				});
+			});
 			this.ws.on("open", () => {
 				if (this.connectionLoggingEnabled) console.log(`[WebSocketClient] Connected to space ${this.spaceId}`);
 				resolve();
@@ -7304,24 +7324,82 @@ function stringValue(value) {
 }
 //#endregion
 //#region src/shared/recipes.ts
+var RECIPE_CREATION_ACTIONS = [
+	"generate",
+	"derive",
+	"regenerate",
+	"vary",
+	"fork",
+	"copy",
+	"upload"
+];
+function isRecipeCreationAction(value) {
+	return typeof value === "string" && RECIPE_CREATION_ACTIONS.includes(value);
+}
 /** Public projections expose product semantics; resolvers expose origins as compact Variant refs. */
 function publicRecipeCreation(value) {
-	if (!isRecord(value) || typeof value.action !== "string") return void 0;
-	if (![
-		"generate",
-		"derive",
-		"regenerate",
-		"vary",
-		"fork",
-		"copy",
-		"upload"
-	].includes(value.action)) return;
+	if (!isRecord(value) || !isRecipeCreationAction(value.action)) return void 0;
 	return { action: value.action };
 }
 function isRecord(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 //#endregion
+//#region src/shared/recipeProjection.ts
+function parseRecipeObject(value) {
+	try {
+		const parsed = typeof value === "string" ? JSON.parse(value) : value;
+		return parsed !== null && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null;
+	} catch {
+		return null;
+	}
+}
+var INTERNAL_RECIPE_CONTAINERS = new Set([
+	"references",
+	"uploadstorage",
+	"providerrequest",
+	"providerresponse",
+	"providerdiagnostic",
+	"providerdiagnostics",
+	"providermetadata",
+	"diagnostic",
+	"diagnostics",
+	"rawupstream",
+	"upstreamraw",
+	"upstreamrequest",
+	"upstreamresponse"
+]);
+function normalizedKey(key) {
+	return key.replace(/[^a-zA-Z0-9]/gu, "").toLowerCase();
+}
+function isRoutingContainer(key) {
+	return /(?:storage|image|media|thumb|thumbnail|sidecar)s?$/u.test(normalizedKey(key));
+}
+function isInternalField(key, value, insideRoutingContainer) {
+	const normalized = normalizedKey(key);
+	if (INTERNAL_RECIPE_CONTAINERS.has(normalized)) return true;
+	if (/(?:storage|image|media|thumb|thumbnail|sidecar|r2|object)(?:key|keys|path|paths|url|urls|uri|uris|bucket|object|objects|locator|route|routing)$/u.test(normalized) || /(?:space|asset|variant|user|creator|run|request|workflow|task|checkpoint|execution|reference|planstep|job|prediction|generation|operation|submission)ids?$/u.test(normalized) || normalized === "createdby" || /taskpayload$/u.test(normalized) || /credentials?/u.test(normalized) || /^(?:api|auth|access|refresh|bearer|session|secret|provider)tokens?/u.test(normalized) || normalized === "token" || normalized === "tokens" || /binary|base64/u.test(normalized) || /(?:api|private|secret)(?:[a-z0-9]*)(?:key|secret)$/u.test(normalized) || /(?:secret|password)$/u.test(normalized) || normalized === "accesskey" || normalized === "authorization" || /headers?$/u.test(normalized) || /cookie/u.test(normalized) || /^(?:key|keys|path|paths|url|urls|uri|uris|bucket|object|objects|locator|route|routing)$/u.test(normalized) && insideRoutingContainer) return true;
+	return (Array.isArray(value) || value !== null && typeof value === "object") && (/diagnostic/u.test(normalized) || /^(?:provider(?:request|response|metadata)|rawupstream|upstream(?:raw|request|response)|workflow|task|checkpoint|executiontarget|credential|credentials|token|tokens|binary|base64)/u.test(normalized));
+}
+function projectExternalValue(value, insideRoutingContainer = false) {
+	if (Array.isArray(value)) return value.map((item) => projectExternalValue(item, insideRoutingContainer));
+	if (value === null || typeof value !== "object") return value;
+	return Object.fromEntries(Object.entries(value).filter(([key, child]) => !isInternalField(key, child, insideRoutingContainer)).map(([key, child]) => [key, projectExternalValue(child, insideRoutingContainer || isRoutingContainer(key))]));
+}
+/** Projection for CLI, MCP, public API, and public viewers. Raw internal IDs never cross this boundary. */
+function projectExternalRecipe(value) {
+	const parsed = parseRecipeObject(value);
+	if (!parsed) return null;
+	const projected = projectExternalValue(parsed);
+	const creation = publicRecipeCreation(projected.creation);
+	const execution = projected.execution !== null && typeof projected.execution === "object" && !Array.isArray(projected.execution) ? Object.fromEntries(Object.entries(projected.execution).filter(([key]) => key !== "target")) : projected.execution;
+	return {
+		...projected,
+		...execution !== void 0 ? { execution } : {},
+		...creation ? { creation } : {}
+	};
+}
+//#endregion
 //#region src/cli/commands/assets.ts
 var defaultDeps$13 = {
 	loadConfig: loadStoredConfig,
@@ -7762,8 +7840,8 @@ function printAssetDetails(details, ctx, print) {
 				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 (detail.parents.input.length > 0) for (const reference of detail.parents.input) print(`     Reference[${reference.sequence_index}] ${reference.slot}: ${formatRecipeReferenceTarget(reference)}`);
+				print(`     Relations: parents=${Object.values(detail.parents).reduce((sum, group) => sum + group.length, 0)} children=${Object.values(detail.children_total).reduce((sum, count) => sum + count, 0)}`);
 			}
 		}
 	}
@@ -7771,6 +7849,28 @@ function printAssetDetails(details, ctx, print) {
 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 toCliRecipeTarget(target) {
+	return {
+		variantRef: target.available && target.asset_id && target.asset_name ? createVariantRef(target.asset_name, target.asset_id, target.variant_id) : null,
+		available: target.available,
+		...target.media_kind ? { mediaKind: target.media_kind } : {},
+		...target.status ? { status: target.status } : {}
+	};
+}
+function toCliInputReference(reference) {
+	return {
+		...toCliRecipeTarget(reference),
+		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
+	};
+}
 function toAssetJson(asset) {
 	return {
 		assetRef: createAssetRef(asset.name, asset.id),
@@ -7804,36 +7904,29 @@ function toAssetDetailsJson(details) {
 				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
+			parents: {
+				input: detail.parents.input.map(toCliInputReference),
+				regenerate: detail.parents.regenerate.map(toCliRecipeTarget),
+				vary: detail.parents.vary.map(toCliRecipeTarget),
+				fork: detail.parents.fork.map(toCliRecipeTarget),
+				copy: detail.parents.copy.map(toCliRecipeTarget)
+			},
+			children: {
+				input: detail.children.input.map(toCliRecipeTarget),
+				regenerate: detail.children.regenerate.map(toCliRecipeTarget),
+				vary: detail.children.vary.map(toCliRecipeTarget),
+				fork: detail.children.fork.map(toCliRecipeTarget),
+				copy: detail.children.copy.map(toCliRecipeTarget)
+			},
+			childrenTotal: detail.children_total,
+			childrenTruncated: detail.children_truncated
 		})),
 		totalVariantCount: details.recipe_references.total_variant_count,
 		truncated: details.recipe_references.truncated
 	};
 }
 function publicCliRecipe(recipe) {
-	if (!recipe) return null;
-	const { references: _references, regeneration: _regeneration, copiedFromVariantId: _copiedFromVariantId, creation: rawCreation, ...publicRecipe } = recipe;
-	const creation = publicRecipeCreation(rawCreation);
-	return {
-		...publicRecipe,
-		...creation ? { creation } : {}
-	};
+	return projectExternalRecipe(recipe);
 }
 function formatTimestamp(value) {
 	if (!value) return "-";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "makefx",
-  "version": "1.6.12",
+  "version": "1.6.13",
   "description": "MakeFX CLI for reproducible image, video, and audio Assets in Make Effects.",
   "homepage": "https://makefx.app/docs/cli",
   "keywords": [