makefx 1.6.5 → 1.6.7

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.5
+Version: 1.6.7

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.5+9c81b1e6ede4";
+var CLI_VERSION = "1.6.7+0439271d1461";
 var CLI_VERSION_HEADER = "X-MakeFX-CLI-Version";
 function cliVersionHeaders() {
 	return {
@@ -4461,6 +4461,7 @@ function cliVersionHeaders() {
 var GENERATION_REQUEST_TIMEOUT_MS = 3e5;
 var VIDEO_GENERATION_REQUEST_TIMEOUT_MS = 72e4;
 var VARIANT_SYNC_POLL_INTERVAL_MS = 15e3;
+var GENERATION_RECONNECT_RETRY_MS = 1e3;
 function getGenerationRequestTimeoutMs(mediaKind) {
 	return mediaKind === "video" ? VIDEO_GENERATION_REQUEST_TIMEOUT_MS : GENERATION_REQUEST_TIMEOUT_MS;
 }
@@ -4493,6 +4494,8 @@ var WebSocketClient = class WebSocketClient {
 	env;
 	spaceId;
 	connectionLoggingEnabled = false;
+	disconnectRequested = false;
+	generationReconnect = null;
 	chatHandlers = /* @__PURE__ */ new Map();
 	generateHandlers = /* @__PURE__ */ new Map();
 	earlyTerminalVariants = /* @__PURE__ */ new Map();
@@ -4535,6 +4538,7 @@ var WebSocketClient = class WebSocketClient {
 	* Connect to the WebSocket endpoint
 	*/
 	async connect() {
+		this.disconnectRequested = false;
 		return new Promise((resolve, reject) => {
 			const protocol = this.baseUrl.startsWith("https") ? "wss" : "ws";
 			const url = `${protocol}://${this.baseUrl.replace(/^https?:\/\//, "")}/api/spaces/${this.spaceId}/ws`;
@@ -4563,7 +4567,7 @@ var WebSocketClient = class WebSocketClient {
 			});
 			this.ws.on("close", (code, reason) => {
 				if (this.connectionLoggingEnabled) console.log(`[WebSocketClient] Disconnected: ${code} - ${reason}`);
-				this.ws = null;
+				this.handleSocketClose();
 			});
 		});
 	}
@@ -4571,11 +4575,35 @@ var WebSocketClient = class WebSocketClient {
 	* Disconnect from the WebSocket
 	*/
 	disconnect() {
+		this.disconnectRequested = true;
 		if (this.ws) {
 			this.ws.close();
 			this.ws = null;
 		}
 	}
+	handleSocketClose() {
+		this.ws = null;
+		if (!this.disconnectRequested && this.hasPendingGenerationWaits()) this.reconnectPendingGeneration();
+	}
+	hasPendingGenerationWaits() {
+		return this.generateHandlers.size > 0 || this.variantCompletionHandlers.size > 0;
+	}
+	reconnectPendingGeneration() {
+		if (this.generationReconnect || this.disconnectRequested || !this.hasPendingGenerationWaits()) return;
+		this.generationReconnect = this.runGenerationReconnect().finally(() => {
+			this.generationReconnect = null;
+		});
+	}
+	async runGenerationReconnect() {
+		while (!this.disconnectRequested && this.hasPendingGenerationWaits()) try {
+			await this.connect();
+			if (this.hasPendingGenerationWaits()) this.requestSync();
+			return;
+		} catch {
+			if (this.disconnectRequested || !this.hasPendingGenerationWaits()) return;
+			await new Promise((resolve) => setTimeout(resolve, GENERATION_RECONNECT_RETRY_MS));
+		}
+	}
 	/**
 	* Set error handler
 	*/
@@ -4644,36 +4672,16 @@ var WebSocketClient = class WebSocketClient {
 				this.onChatProgress?.(progressMsg);
 				break;
 			}
-			case "generate:started": {
-				const startedMsg = message;
-				const handler = this.generateHandlers.get(startedMsg.requestId);
-				if (handler) {
-					if (handler.onStarted) handler.onStarted(startedMsg);
-					this.variantCompletionHandlers.set(startedMsg.variantId, {
-						requestId: startedMsg.requestId,
-						assetId: startedMsg.assetId,
-						assetName: startedMsg.assetName,
-						onResult: handler.onResult,
-						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) {
-						this.earlyTerminalVariants.delete(startedMsg.variantId);
-						this.handleTerminalVariant(earlyTerminal);
-					}
-					this.clearOrphanedEarlyTerminalVariants();
-				}
+			case "generate:started":
+				this.handleGenerateStarted(message);
 				break;
-			}
 			case "generate:error": {
 				const errorMsg = message;
 				const handler = this.generateHandlers.get(errorMsg.requestId);
 				if (handler) {
 					this.generateHandlers.delete(errorMsg.requestId);
 					clearTimeout(handler.timeout);
+					if (handler.syncPoll) clearInterval(handler.syncPoll);
 					handler.reject(new Error(formatServerErrorMessage(errorMsg.code, errorMsg.error)));
 					this.clearOrphanedEarlyTerminalVariants();
 				}
@@ -4690,6 +4698,19 @@ var WebSocketClient = class WebSocketClient {
 			}
 			case "sync:state": {
 				const syncMsg = message;
+				for (const variant of syncMsg.variants) {
+					if (!variant.request_id || !this.generateHandlers.has(variant.request_id)) continue;
+					const asset = syncMsg.assets.find((candidate) => candidate.id === variant.asset_id);
+					this.handleGenerateStarted({
+						type: "generate:started",
+						requestId: variant.request_id,
+						variantId: variant.id,
+						runId: variant.run_id ?? "",
+						status: variant.status === "uploading" ? "running" : variant.status,
+						assetId: variant.asset_id,
+						assetName: asset?.name ?? "asset"
+					});
+				}
 				for (const variant of syncMsg.variants) {
 					const handler = this.variantCompletionHandlers.get(variant.id);
 					if (!handler) continue;
@@ -4801,6 +4822,7 @@ var WebSocketClient = class WebSocketClient {
 		if (generateHandler) {
 			this.generateHandlers.delete(requestId);
 			clearTimeout(generateHandler.timeout);
+			if (generateHandler.syncPoll) clearInterval(generateHandler.syncPoll);
 			generateHandler.reject(error);
 			this.clearOrphanedEarlyTerminalVariants();
 			return true;
@@ -4814,6 +4836,28 @@ var WebSocketClient = class WebSocketClient {
 		}
 		return false;
 	}
+	handleGenerateStarted(started) {
+		const handler = this.generateHandlers.get(started.requestId);
+		if (!handler) return;
+		handler.onStarted?.(started);
+		if (handler.syncPoll) clearInterval(handler.syncPoll);
+		this.variantCompletionHandlers.set(started.variantId, {
+			requestId: started.requestId,
+			assetId: started.assetId,
+			assetName: started.assetName,
+			onResult: handler.onResult,
+			reject: handler.reject,
+			timeout: handler.timeout
+		});
+		this.generateHandlers.delete(started.requestId);
+		this.startVariantSyncPolling(started.variantId, started.requestId);
+		const earlyTerminal = this.earlyTerminalVariants.get(started.variantId);
+		if (earlyTerminal) {
+			this.earlyTerminalVariants.delete(started.variantId);
+			this.handleTerminalVariant(earlyTerminal);
+		}
+		this.clearOrphanedEarlyTerminalVariants();
+	}
 	handleTerminalVariant(variant) {
 		let handled = false;
 		const handler = this.variantCompletionHandlers.get(variant.id);
@@ -4847,6 +4891,19 @@ var WebSocketClient = class WebSocketClient {
 		if (handler?.requestId === requestId) handler.syncPoll = syncPoll;
 		else clearInterval(syncPoll);
 	}
+	startGenerateSyncPolling(requestId) {
+		const requestCurrentState = () => {
+			if (!this.generateHandlers.has(requestId)) return;
+			try {
+				this.requestSync();
+			} catch {}
+		};
+		requestCurrentState();
+		const syncPoll = setInterval(requestCurrentState, VARIANT_SYNC_POLL_INTERVAL_MS);
+		const handler = this.generateHandlers.get(requestId);
+		if (handler) handler.syncPoll = syncPoll;
+		else clearInterval(syncPoll);
+	}
 	hasRequestsAwaitingStarted() {
 		return this.generateHandlers.size > 0 || this.draftRunStartsAwaitingVariant.size > 0;
 	}
@@ -5098,8 +5155,10 @@ var WebSocketClient = class WebSocketClient {
 		const timeoutMs = getGenerationRequestTimeoutMs(params.mediaKind);
 		return new Promise((resolve, reject) => {
 			const timeout = setTimeout(() => {
-				if (this.generateHandlers.get(requestId)) {
+				const requestHandler = this.generateHandlers.get(requestId);
+				if (requestHandler) {
 					this.generateHandlers.delete(requestId);
+					if (requestHandler.syncPoll) clearInterval(requestHandler.syncPoll);
 					this.clearOrphanedEarlyTerminalVariants();
 					reject(/* @__PURE__ */ new Error("Generate request timed out"));
 					return;
@@ -5149,6 +5208,7 @@ var WebSocketClient = class WebSocketClient {
 			};
 			try {
 				this.send(message);
+				this.startGenerateSyncPolling(requestId);
 			} catch (err) {
 				this.generateHandlers.delete(requestId);
 				clearTimeout(timeout);

package/package.json

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