makefx 1.0.1 → 1.0.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: 1.0.1
+Version: 1.0.2

package/makefx.mjs

@@ -5609,6 +5609,33 @@ Examples:
 `);
 }
 //#endregion
+//#region src/cli/lib/error-format.ts
+function formatServerErrorMessage(code, message) {
+	return `${code}: ${formatGenerationFailureMessage(message)}`;
+}
+function formatGenerationFailureMessage(message) {
+	const rawMessage = message?.trim() || "Generation failed";
+	const cleanMessage = extractProviderErrorMessage(rawMessage) ?? rawMessage;
+	if (isProviderAuthenticationError(cleanMessage)) return "The generation provider is not configured correctly. Try again later or contact Make Effects support.";
+	return cleanMessage;
+}
+function extractProviderErrorMessage(message) {
+	const match = message.match(/ApiError:\s*(\{.*\})/s);
+	if (!match) return null;
+	try {
+		const parsed = JSON.parse(match[1]);
+		if (typeof parsed.error?.message === "string") return parsed.error.message;
+		if (typeof parsed.error?.status === "string") return parsed.error.status;
+	} catch {
+		return "Provider request failed";
+	}
+	return "Provider request failed";
+}
+function isProviderAuthenticationError(message) {
+	const lower = message.toLowerCase();
+	return lower.includes("api key not valid") || lower.includes("api_key_invalid") || lower.includes("invalid api key") || lower.includes("generativelanguage.googleapis.com");
+}
+//#endregion
 //#region src/cli/lib/run-manifest.ts
 function createRunId(date = /* @__PURE__ */ new Date()) {
 	return `${date.toISOString().replace(/[-:]/g, "").replace(/\.\d{3}Z$/, "Z")}-${crypto.randomUUID().slice(0, 8)}`;
@@ -5866,7 +5893,7 @@ var WebSocketClient = class WebSocketClient {
 	accessToken;
 	env;
 	spaceId;
-	connectionLoggingEnabled = true;
+	connectionLoggingEnabled = false;
 	chatHandlers = /* @__PURE__ */ new Map();
 	generateHandlers = /* @__PURE__ */ new Map();
 	batchHandlers = /* @__PURE__ */ new Map();
@@ -5926,11 +5953,10 @@ var WebSocketClient = class WebSocketClient {
 					const message = JSON.parse(data.toString());
 					this.handleMessage(message);
 				} catch (err) {
-					console.error("[WebSocketClient] Error parsing message:", err);
+					this.onError?.(err instanceof Error ? err : /* @__PURE__ */ new Error("Received an unreadable real-time update"));
 				}
 			});
 			this.ws.on("error", (err) => {
-				console.error("[WebSocketClient] WebSocket error:", err);
 				this.onError?.(err);
 				reject(err);
 			});
@@ -6053,7 +6079,7 @@ var WebSocketClient = class WebSocketClient {
 				if (handler) {
 					this.generateHandlers.delete(errorMsg.requestId);
 					clearTimeout(handler.timeout);
-					handler.reject(/* @__PURE__ */ new Error(`${errorMsg.code}: ${errorMsg.error}`));
+					handler.reject(new Error(formatServerErrorMessage(errorMsg.code, errorMsg.error)));
 				}
 				break;
 			}
@@ -6063,7 +6089,7 @@ var WebSocketClient = class WebSocketClient {
 				if (handler) {
 					this.batchHandlers.delete(errorMsg.requestId);
 					clearTimeout(handler.timeout);
-					handler.reject(/* @__PURE__ */ new Error(`${errorMsg.code}: ${errorMsg.error}`));
+					handler.reject(new Error(formatServerErrorMessage(errorMsg.code, errorMsg.error)));
 				}
 				break;
 			}
@@ -6088,7 +6114,7 @@ var WebSocketClient = class WebSocketClient {
 						if (variant.status === "completed") batchHandler.completed.push(variant);
 						else batchHandler.failed.push({
 							variantId: variant.id,
-							error: variant.error_message || "Generation failed"
+							error: formatGenerationFailureMessage(variant.error_message)
 						});
 						if (batchHandler.pending.size === 0) {
 							this.batchHandlers.delete(batchRequestId);
@@ -6116,7 +6142,7 @@ var WebSocketClient = class WebSocketClient {
 							jobId: variant.id,
 							success: variant.status === "completed",
 							variant: variant.status === "completed" ? variant : void 0,
-							error: variant.status === "failed" ? variant.error_message || "Generation failed" : void 0
+							error: variant.status === "failed" ? formatGenerationFailureMessage(variant.error_message) : void 0
 						};
 						handler.onResult(result);
 					}
@@ -6167,7 +6193,7 @@ var WebSocketClient = class WebSocketClient {
 				const mutationConsumed = this.failMutationWaiters(error);
 				const estimateConsumed = this.failEstimateHandlers(error);
 				if (!(mutationConsumed || estimateConsumed)) {
-					console.error(`[WebSocketClient] Server error: ${errorMsg.code} - ${errorMsg.message}`);
+					console.error(`Server error: ${formatServerErrorMessage(errorMsg.code, errorMsg.message)}`);
 					this.onError?.(new Error(errorMsg.message));
 				}
 				break;
@@ -7068,10 +7094,15 @@ async function handleForgeCommand(command, parsed) {
 		await executeForgeCommand(command, parsed, defaultDeps$7);
 	} catch (error) {
 		console.error("Error:", error instanceof Error ? error.message : error);
-		printUsage$7(command);
+		if (shouldPrintUsageForForgeError(error)) printUsage$7(command);
 		process$1.exitCode = 1;
 	}
 }
+function shouldPrintUsageForForgeError(error) {
+	if (!(error instanceof Error)) return false;
+	const message = error.message;
+	return message.startsWith("--") || message.startsWith("Output path is required") || message.startsWith("Output directory is required") || message.startsWith("Pass either prompt text") || message.startsWith("Speech generation requires") || message.startsWith("Dialogue generation requires") || message.startsWith("Prompt is required");
+}
 async function executeForgeCommand(command, parsed, deps = defaultDeps$7, options = {}) {
 	const mediaKind = options.mediaKind || CLI_GENERATION_MEDIA_KIND;
 	if (parsed.options.follow) {
@@ -7497,7 +7528,7 @@ function resultFromTerminalVariant(variant, requestId) {
 		requestId,
 		jobId: variant.id,
 		success: false,
-		error: variant.error_message || "Generation failed"
+		error: formatGenerationFailureMessage(variant.error_message)
 	};
 }
 function parseGenerationRecipe(recipeJson) {
@@ -9256,7 +9287,7 @@ Options:
 }
 //#endregion
 //#region src/cli/index.ts
-var CLI_VERSION = "1.0.1+b273381daffd";
+var CLI_VERSION = "1.0.2+ce1ff2c1182d";
 async function main() {
 	const argv = process$1.argv.slice(2);
 	if (argv[0] === "--") argv.shift();

package/package.json

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