makefx 1.6.4 → 1.6.5

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.4
+Version: 1.6.5

package/makefx.mjs

@@ -4442,7 +4442,7 @@ require_websocket_server();
 var wrapper_default = import_websocket.default;
 //#endregion
 //#region src/cli/version.ts
-var CLI_VERSION = "1.6.4+0753202e927c";
+var CLI_VERSION = "1.6.5+9c81b1e6ede4";
 var CLI_VERSION_HEADER = "X-MakeFX-CLI-Version";
 function cliVersionHeaders() {
 	return {
@@ -4460,6 +4460,7 @@ function cliVersionHeaders() {
 */
 var GENERATION_REQUEST_TIMEOUT_MS = 3e5;
 var VIDEO_GENERATION_REQUEST_TIMEOUT_MS = 72e4;
+var VARIANT_SYNC_POLL_INTERVAL_MS = 15e3;
 function getGenerationRequestTimeoutMs(mediaKind) {
 	return mediaKind === "video" ? VIDEO_GENERATION_REQUEST_TIMEOUT_MS : GENERATION_REQUEST_TIMEOUT_MS;
 }
@@ -4656,6 +4657,7 @@ var WebSocketClient = class WebSocketClient {
 						reject: handler.reject,
 						timeout: handler.timeout
 					});
+					this.startVariantSyncPolling(startedMsg.variantId, startedMsg.requestId);
 					this.generateHandlers.delete(startedMsg.requestId);
 					const earlyTerminal = this.earlyTerminalVariants.get(startedMsg.variantId);
 					if (earlyTerminal) {
@@ -4688,6 +4690,12 @@ var WebSocketClient = class WebSocketClient {
 			}
 			case "sync:state": {
 				const syncMsg = message;
+				for (const variant of syncMsg.variants) {
+					const handler = this.variantCompletionHandlers.get(variant.id);
+					if (!handler) continue;
+					handler.onUpdate?.(variant);
+					if (variant.status === "completed" || variant.status === "failed") this.handleTerminalVariant(variant);
+				}
 				this.onSyncState?.({
 					assets: syncMsg.assets,
 					variants: syncMsg.variants,
@@ -4800,6 +4808,7 @@ var WebSocketClient = class WebSocketClient {
 		for (const [variantId, handler] of this.variantCompletionHandlers) if (handler.requestId === requestId) {
 			this.variantCompletionHandlers.delete(variantId);
 			clearTimeout(handler.timeout);
+			if (handler.syncPoll) clearInterval(handler.syncPoll);
 			handler.reject(error);
 			return true;
 		}
@@ -4812,6 +4821,7 @@ var WebSocketClient = class WebSocketClient {
 			handled = true;
 			this.variantCompletionHandlers.delete(variant.id);
 			clearTimeout(handler.timeout);
+			if (handler.syncPoll) clearInterval(handler.syncPoll);
 			handler.onResult({
 				requestId: handler.requestId,
 				variantId: variant.id,
@@ -4824,6 +4834,19 @@ var WebSocketClient = class WebSocketClient {
 		}
 		return handled;
 	}
+	startVariantSyncPolling(variantId, requestId) {
+		const requestCurrentState = () => {
+			if (this.variantCompletionHandlers.get(variantId)?.requestId !== requestId) return;
+			try {
+				this.requestSync();
+			} catch {}
+		};
+		requestCurrentState();
+		const syncPoll = setInterval(requestCurrentState, VARIANT_SYNC_POLL_INTERVAL_MS);
+		const handler = this.variantCompletionHandlers.get(variantId);
+		if (handler?.requestId === requestId) handler.syncPoll = syncPoll;
+		else clearInterval(syncPoll);
+	}
 	hasRequestsAwaitingStarted() {
 		return this.generateHandlers.size > 0 || this.draftRunStartsAwaitingVariant.size > 0;
 	}
@@ -5083,6 +5106,7 @@ var WebSocketClient = class WebSocketClient {
 				}
 				for (const [variantId, handler] of this.variantCompletionHandlers) if (handler.requestId === requestId) {
 					this.variantCompletionHandlers.delete(variantId);
+					if (handler.syncPoll) clearInterval(handler.syncPoll);
 					reject(/* @__PURE__ */ new Error("Generate request timed out"));
 					return;
 				}
@@ -5138,8 +5162,10 @@ var WebSocketClient = class WebSocketClient {
 		const timeoutMs = params.timeoutMs ?? 3e5;
 		return new Promise((resolve, reject) => {
 			const timeout = setTimeout(() => {
-				if (this.variantCompletionHandlers.get(params.variantId)?.requestId === requestId) {
+				const handler = this.variantCompletionHandlers.get(params.variantId);
+				if (handler?.requestId === requestId) {
 					this.variantCompletionHandlers.delete(params.variantId);
+					if (handler.syncPoll) clearInterval(handler.syncPoll);
 					reject(/* @__PURE__ */ new Error("Follow request timed out"));
 				}
 			}, timeoutMs);
@@ -5152,6 +5178,7 @@ var WebSocketClient = class WebSocketClient {
 				reject,
 				timeout
 			});
+			this.startVariantSyncPolling(params.variantId, requestId);
 			const earlyTerminal = this.earlyTerminalVariants.get(params.variantId);
 			if (earlyTerminal) {
 				this.earlyTerminalVariants.delete(params.variantId);
@@ -5165,6 +5192,7 @@ var WebSocketClient = class WebSocketClient {
 		if (requestId && handler.requestId !== requestId) return;
 		this.variantCompletionHandlers.delete(variantId);
 		clearTimeout(handler.timeout);
+		if (handler.syncPoll) clearInterval(handler.syncPoll);
 	}
 	/**
 	* Send a describe image request and wait for response

package/package.json

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