everything-dev 1.44.1 → 1.45.0

package/dist/plugin.cjs

@@ -231,9 +231,9 @@ async function waitForPublishedConfig(opts) {
 	const reason = lastError instanceof Error ? ` Last error: ${lastError.message}` : "";
 	throw new Error(`Timed out waiting for publish confirmation at bos://${opts.account}/${opts.gateway}.${reason}`);
 }
-async function buildEveryPluginQuietly(cwd) {
+async function buildEveryPluginQuietly(cwd, force = false) {
 	if (!await fileExists(`${`${cwd}/packages/every-plugin`}/package.json`)) return;
-	if (await fileExists(`${cwd}/packages/every-plugin/dist/build/rspack/plugin.mjs`)) return;
+	if (await fileExists(`${cwd}/packages/every-plugin/dist/build/rspack/plugin.mjs`) && !force) return;
 	const result = await require_run.run("bun", [
 		"run",
 		"--cwd",
@@ -243,17 +243,14 @@ async function buildEveryPluginQuietly(cwd) {
 		cwd,
 		capture: true
 	});
-	if (result.exitCode === 0) {
-		console.log("[build:ssr] build succeeded");
-		return;
-	}
+	if (result.exitCode === 0) return;
 	if (result.stdout.trim()) node_process.default.stdout.write(result.stdout);
 	if (result.stderr.trim()) node_process.default.stderr.write(result.stderr);
 	throw new Error(`bun run --cwd packages/every-plugin build failed with exit code ${result.exitCode}`);
 }
-async function buildEverythingDevQuietly(cwd) {
+async function buildEverythingDevQuietly(cwd, force = false) {
 	if (!await fileExists(`${`${cwd}/packages/everything-dev`}/package.json`)) return;
-	if (await fileExists(`${cwd}/packages/everything-dev/dist/index.mjs`)) return;
+	if (await fileExists(`${cwd}/packages/everything-dev/dist/index.mjs`) && !force) return;
 	const result = await require_run.run("bun", [
 		"run",
 		"--cwd",
@@ -263,10 +260,7 @@ async function buildEverythingDevQuietly(cwd) {
 		cwd,
 		capture: true
 	});
-	if (result.exitCode === 0) {
-		console.log("[everything-dev] build succeeded");
-		return;
-	}
+	if (result.exitCode === 0) return;
 	if (result.stdout.trim()) node_process.default.stdout.write(result.stdout);
 	if (result.stderr.trim()) node_process.default.stderr.write(result.stderr);
 	throw new Error(`bun run --cwd packages/everything-dev build failed with exit code ${result.exitCode}`);
@@ -299,6 +293,141 @@ function selectWorkspaceTargets(packages, bosConfig) {
 	if (packages === "all") return allPackages;
 	return packages.split(",").map((pkg) => pkg.trim()).filter((pkg) => allPackages.includes(pkg));
 }
+function padRight(str, len) {
+	return str.length >= len ? str : str + " ".repeat(len - str.length);
+}
+function formatDuration(ms) {
+	if (ms < 1e3) return `${ms}ms`;
+	return `${(ms / 1e3).toFixed(1)}s`;
+}
+async function runBuildAttempt(cmd, args, cwd, env, verbose, wsKey, resultBaseDir) {
+	if (verbose) try {
+		await require_run.run(cmd, args, {
+			cwd,
+			env,
+			capture: false
+		});
+		if (resultBaseDir) {
+			const results = require_integrity.readDeployResults((0, node_path.join)(resultBaseDir, wsKey));
+			if (results.length > 0) return {
+				success: true,
+				url: results[0]?.url,
+				exitCode: 0,
+				output: ""
+			};
+		}
+		return {
+			success: true,
+			exitCode: 0,
+			output: ""
+		};
+	} catch (err) {
+		return {
+			success: false,
+			error: err instanceof Error ? err.message : String(err),
+			exitCode: 1,
+			output: ""
+		};
+	}
+	const result = await require_run.run(cmd, args, {
+		cwd,
+		env,
+		capture: true
+	});
+	const stdout = result?.stdout ?? "";
+	const stderr = result?.stderr ?? "";
+	const exitCode = result?.exitCode ?? 0;
+	const output = `${stdout}\n${stderr}`;
+	if (exitCode !== 0) return {
+		success: false,
+		error: `Build failed (exit code ${exitCode})\n${output.trim().split("\n").slice(-5).join("\n")}`,
+		exitCode,
+		output
+	};
+	const zeMatch = output.match(/ZE\d+/);
+	if (zeMatch) return {
+		success: false,
+		error: `Zephyr upload failed (${zeMatch[0]})`,
+		exitCode: 0,
+		output
+	};
+	if (resultBaseDir) {
+		const results = require_integrity.readDeployResults((0, node_path.join)(resultBaseDir, wsKey));
+		if (results.length > 0) return {
+			success: true,
+			url: results[0]?.url,
+			exitCode: 0,
+			output
+		};
+	}
+	const deployMatch = output.match(/🚀.*Deployed:\s*(https?:\S+)/);
+	if (deployMatch) return {
+		success: true,
+		url: deployMatch[1],
+		exitCode: 0,
+		output
+	};
+	if (env.DEPLOY === "true") return {
+		success: false,
+		error: "No deploy URL found (Zephyr may have failed)",
+		exitCode: 0,
+		output
+	};
+	return {
+		success: true,
+		exitCode: 0,
+		output
+	};
+}
+async function buildOneWorkspace(ws, env, opts, resultBaseDir) {
+	const pkgJson = await readJsonFile(`${ws.path}/package.json`);
+	const buildConfig = opts.deploy && pkgJson.scripts?.deploy ? {
+		cmd: "bun",
+		args: ["run", "deploy"]
+	} : buildCommands[ws.key] ?? {
+		cmd: "bun",
+		args: ["run", "build"]
+	};
+	const wsEnv = { ...env };
+	if (resultBaseDir) wsEnv.BOS_DEPLOY_RESULT_DIR = (0, node_path.join)(resultBaseDir, ws.key);
+	const startTime = Date.now();
+	let attempt = await runBuildAttempt(buildConfig.cmd, buildConfig.args, ws.path, wsEnv, opts.verbose ?? false, ws.key, resultBaseDir);
+	let retried = false;
+	if (!attempt.success && attempt.exitCode === 0 && opts.deploy) {
+		if (!opts.verbose) console.log(`  ${require_theme.colors.yellow("↻")} ${padRight(ws.key, 28)} retrying...`);
+		if (resultBaseDir) {
+			const wsResultDir = (0, node_path.join)(resultBaseDir, ws.key);
+			if ((0, node_fs.existsSync)(wsResultDir)) (0, node_fs.rmSync)(wsResultDir, {
+				recursive: true,
+				force: true
+			});
+		}
+		retried = true;
+		attempt = await runBuildAttempt(buildConfig.cmd, buildConfig.args, ws.path, wsEnv, opts.verbose ?? false, ws.key, resultBaseDir);
+	}
+	const durationMs = Date.now() - startTime;
+	const result = {
+		key: ws.key,
+		kind: ws.kind,
+		success: attempt.success,
+		url: attempt.url,
+		error: attempt.error,
+		durationMs,
+		retried: retried ? true : void 0
+	};
+	if (!opts.verbose) {
+		const name = padRight(ws.key, 28);
+		if (result.success) {
+			const duration = formatDuration(durationMs);
+			const retryTag = retried ? " (retried)" : "";
+			console.log(`  ${require_theme.colors.green(require_theme.icons.ok)} ${name} ${require_theme.colors.dim(duration + retryTag)}`);
+		} else {
+			const errorLine = (result.error ?? "Failed").split("\n")[0];
+			console.log(`  ${require_theme.colors.error(require_theme.icons.err)} ${name} ${errorLine}`);
+		}
+	}
+	return result;
+}
 async function buildWorkspaceTargets(opts) {
 	const existing = [];
 	const skipped = [];
@@ -322,8 +451,9 @@ async function buildWorkspaceTargets(opts) {
 		extendsChain: []
 	})).catalogChanged) await require_run.run("bun", ["install"], { cwd: opts.configDir });
 	const shouldBuildPlugin = existing.some((entry) => entry.key === "api");
-	const buildTasks = [buildEverythingDevQuietly(opts.configDir)];
-	if (shouldBuildPlugin) buildTasks.push(buildEveryPluginQuietly(opts.configDir));
+	const forceRebuild = opts.deploy;
+	const buildTasks = [buildEverythingDevQuietly(opts.configDir, forceRebuild)];
+	if (shouldBuildPlugin) buildTasks.push(buildEveryPluginQuietly(opts.configDir, forceRebuild));
 	await Promise.all(buildTasks);
 	const env = {
 		...node_process.default.env,
@@ -331,18 +461,63 @@ async function buildWorkspaceTargets(opts) {
 	};
 	if (opts.deploy) env.DEPLOY = "true";
 	else delete env.DEPLOY;
+	const resultBaseDir = opts.deploy ? (0, node_path.join)(opts.configDir, ".bos", "deploy-results") : void 0;
+	if (resultBaseDir) require_integrity.cleanDeployResultDir(resultBaseDir);
+	const bosConfigPath = (0, node_path.join)(opts.configDir, "bos.config.json");
+	let configSnapshot;
+	if (opts.deploy && (0, node_fs.existsSync)(bosConfigPath)) configSnapshot = (0, node_fs.readFileSync)(bosConfigPath, "utf-8");
 	const orderedExisting = opts.deploy ? [
 		...existing.filter((entry) => entry.kind === "app" && entry.key !== "host"),
 		...existing.filter((entry) => entry.kind === "plugin"),
 		...existing.filter((entry) => entry.kind === "app" && entry.key === "host")
 	] : existing;
+	const parallelGroup = opts.deploy ? orderedExisting.filter((e) => e.key !== "host") : orderedExisting;
+	const sequentialGroup = opts.deploy ? orderedExisting.filter((e) => e.key === "host") : [];
 	const built = [];
-	for (const resolved of orderedExisting) {
-		const pkgJson = await readJsonFile(`${resolved.path}/package.json`);
-		const buildConfig = opts.deploy && pkgJson.scripts?.deploy ? {
-			cmd: "bun",
-			args: ["run", "deploy"]
-		} : buildCommands[resolved.key] ?? {
+	const deployResults = [];
+	if (opts.deploy && parallelGroup.length > 0) {
+		const total = parallelGroup.length + sequentialGroup.length;
+		console.log();
+		console.log(`  Building ${total} workspace${total > 1 ? "s" : ""}...`);
+		console.log();
+		const results = await Promise.allSettled(parallelGroup.map((ws) => buildOneWorkspace(ws, env, opts, resultBaseDir)));
+		for (let i = 0; i < parallelGroup.length; i++) {
+			const ws = parallelGroup[i];
+			const result = results[i];
+			if (result.status === "fulfilled") {
+				if (result.value.success) built.push(ws.key);
+				deployResults.push(result.value);
+			} else deployResults.push({
+				key: ws.key,
+				kind: ws.kind,
+				success: false,
+				error: result.reason?.message ?? "Unknown error"
+			});
+		}
+		if (resultBaseDir && configSnapshot) {
+			const allResults = require_integrity.readAllDeployResults(resultBaseDir);
+			if (allResults.length > 0) {
+				const merged = require_integrity.applyDeployResults(JSON.parse(configSnapshot), allResults);
+				(0, node_fs.writeFileSync)(bosConfigPath, `${JSON.stringify(merged, null, 2)}\n`);
+			}
+		}
+		for (const ws of sequentialGroup) {
+			const result = await buildOneWorkspace(ws, env, opts, resultBaseDir);
+			if (result.success) built.push(ws.key);
+			deployResults.push(result);
+		}
+		if (resultBaseDir && (0, node_fs.existsSync)(bosConfigPath)) {
+			const allResults = require_integrity.readAllDeployResults(resultBaseDir);
+			const currentConfig = JSON.parse((0, node_fs.readFileSync)(bosConfigPath, "utf-8"));
+			const hostResults = allResults.filter((r) => r.urlField.startsWith("app.host"));
+			if (hostResults.length > 0) {
+				const merged = require_integrity.applyDeployResults(currentConfig, hostResults);
+				(0, node_fs.writeFileSync)(bosConfigPath, `${JSON.stringify(merged, null, 2)}\n`);
+			}
+		}
+		console.log();
+	} else for (const resolved of orderedExisting) {
+		const buildConfig = buildCommands[resolved.key] ?? {
 			cmd: "bun",
 			args: ["run", "build"]
 		};
@@ -354,7 +529,8 @@ async function buildWorkspaceTargets(opts) {
 	}
 	return {
 		built,
-		skipped
+		skipped,
+		deployResults: opts.deploy ? deployResults : void 0
 	};
 }
 var plugin_default = (0, every_plugin.createPlugin)({
@@ -826,6 +1002,7 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				env: input.env,
 				build: input.deploy,
 				dryRun: input.dryRun,
+				verbose: input.verbose,
 				packages: input.packages,
 				network: input.network,
 				privateKey: input.privateKey
@@ -843,7 +1020,8 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				txHash: result.txHash,
 				error: result.error,
 				built: result.built,
-				skipped: result.skipped
+				skipped: result.skipped,
+				deployResults: result.deployResults
 			};
 		}),
 		deploy: builder.deploy.handler(async ({ input }) => {
@@ -860,6 +1038,7 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				env: input.env,
 				build: input.build,
 				dryRun: input.dryRun,
+				verbose: input.verbose,
 				packages: input.packages,
 				network: input.network,
 				privateKey: input.privateKey
@@ -871,7 +1050,8 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				built: result.built,
 				skipped: result.skipped,
 				redeployed: false,
-				error: result.error
+				error: result.error,
+				deployResults: result.deployResults
 			};
 			if (result.status === "dry-run") return {
 				status: "dry-run",
@@ -901,6 +1081,7 @@ var plugin_default = (0, every_plugin.createPlugin)({
 						built: result.built,
 						skipped: result.skipped,
 						redeployed: false,
+						deployResults: result.deployResults,
 						error: "Config published but Railway redeploy failed: ci.railway.service is not configured in bos.config.json"
 					};
 				}
@@ -931,6 +1112,7 @@ var plugin_default = (0, every_plugin.createPlugin)({
 						skipped: result.skipped,
 						redeployed: false,
 						service,
+						deployResults: result.deployResults,
 						error: `Config published but ${railError}`
 					};
 				}
@@ -945,7 +1127,8 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				built: result.built,
 				skipped: result.skipped,
 				redeployed,
-				service
+				service,
+				deployResults: result.deployResults
 			};
 		}),
 		keyPublish: builder.keyPublish.handler(async ({ input }) => {
@@ -1378,13 +1561,28 @@ async function publishToFastKv(input) {
 	const targets = selectWorkspaceTargets(input.packages, bosConfig);
 	let built;
 	let skipped;
+	let deployResults;
 	if (dryRun) return {
 		status: "dry-run",
 		registryUrl,
 		built,
 		skipped
 	};
+	const privateKey = input.privateKey || node_process.default.env.NEAR_PRIVATE_KEY || node_process.default.env.BOS_NEAR_PRIVATE_KEY;
+	let signingMode;
+	try {
+		signingMode = require_near_cli.resolveNearSigningMode(privateKey);
+	} catch (error) {
+		return {
+			status: "error",
+			registryUrl,
+			error: error instanceof Error ? error.message : "Unknown error"
+		};
+	}
 	if (input.build) {
+		console.log("  Ensuring NEAR CLI...");
+		await effect.Effect.runPromise(require_near_cli.ensureNearCli);
+		console.log("  NEAR CLI ready");
 		await generateCodeArtifacts(configDir, bosConfig, {
 			env: "production",
 			runtimeConfig: runtimeConfig ?? void 0
@@ -1394,16 +1592,45 @@ async function publishToFastKv(input) {
 			bosConfig,
 			runtimeConfig,
 			targets,
-			deploy: true
+			deploy: true,
+			verbose: input.verbose
 		});
 		built = result.built;
 		skipped = result.skipped;
+		deployResults = result.deployResults;
+		if (deployResults) {
+			const failures = deployResults.filter((r) => !r.success);
+			if (failures.length > 0) {
+				const total = deployResults.length;
+				console.log();
+				console.log(require_theme.colors.error(`  ${require_theme.icons.err} Deploy failed — ${failures.length} of ${total} workspace${total > 1 ? "s" : ""} failed`));
+				console.log();
+				for (const f of failures) {
+					const errorLine = (f.error ?? "Failed").split("\n")[0];
+					console.log(`    ${require_theme.colors.error(require_theme.icons.err)} ${padRight(f.key, 28)} ${errorLine}`);
+				}
+				console.log();
+				if (!input.verbose) {
+					console.log(require_theme.colors.dim("  Run with --verbose for full build output."));
+					console.log();
+				}
+				return {
+					status: "error",
+					registryUrl,
+					built,
+					skipped,
+					deployResults,
+					error: `${failures.length} of ${total} workspaces failed to deploy`
+				};
+			}
+		}
 		const refreshed = await require_config.loadResolvedConfig({ cwd: configDir });
 		if (!refreshed?.config) return {
 			status: "error",
 			registryUrl,
 			built,
 			skipped,
+			deployResults,
 			error: "Failed to reload bos.config.json after build"
 		};
 		bosConfig = refreshed.config;
@@ -1417,28 +1644,14 @@ async function publishToFastKv(input) {
 	const registryEntries = { [`apps/${account}/${gateway}/bos.config.json`]: JSON.stringify(publishPayload) };
 	const payload = JSON.stringify(registryEntries);
 	const argsBase64 = Buffer.from(payload).toString("base64");
-	const privateKey = input.privateKey || node_process.default.env.NEAR_PRIVATE_KEY || node_process.default.env.BOS_NEAR_PRIVATE_KEY;
-	let signingMode;
-	try {
-		signingMode = require_near_cli.resolveNearSigningMode(privateKey);
-	} catch (error) {
-		return {
-			status: "error",
-			registryUrl,
-			error: error instanceof Error ? error.message : "Unknown error"
-		};
-	}
 	console.log();
 	console.log("  Publishing to:");
 	console.log(`    ${require_theme.colors.cyan(registryUrl)}`);
 	try {
-		console.log("  Ensuring NEAR CLI...");
-		await effect.Effect.runPromise(require_near_cli.ensureNearCli);
-		console.log("  NEAR CLI ready");
 		let txHash;
 		console.log(`  Submitting transaction on ${network}...`);
 		try {
-			txHash = (await effect.Effect.runPromise(require_near_cli.executeTransaction({
+			const tx = await effect.Effect.runPromise(require_near_cli.executeTransaction({
 				account,
 				contract: require_fastkv.getRegistryNamespaceForNetwork(network),
 				method: "__fastdata_kv",
@@ -1446,12 +1659,25 @@ async function publishToFastKv(input) {
 				network,
 				privateKey: signingMode._tag === "privateKey" ? signingMode.privateKey : void 0,
 				gas: "300Tgas",
-				deposit: "0NEAR"
-			}, signingMode))).txHash;
-			if (txHash) console.log(`  Transaction submitted: ${require_theme.colors.dim(txHash)}`);
+				deposit: "0NEAR",
+				verbose: input.verbose
+			}, signingMode));
+			txHash = tx.txHash;
+			if (txHash && !tx.output?.includes("CodeDoesNotExist")) console.log(`  Transaction submitted: ${require_theme.colors.dim(txHash)}`);
 		} catch (error) {
-			txHash = extractTransactionHash(error);
-			if (!txHash) throw error;
+			console.log(require_theme.colors.dim("  Transaction reported an error — verifying publish..."));
+			try {
+				await waitForPublishedConfig({
+					account,
+					gateway,
+					publishConfig: publishPayload,
+					timeoutMs: 3e4,
+					intervalMs: 2e3
+				});
+				txHash = extractTransactionHash(error);
+			} catch {
+				throw error;
+			}
 		}
 		console.log("  Waiting for publish confirmation...");
 		await waitForPublishedConfig({
@@ -1465,18 +1691,26 @@ async function publishToFastKv(input) {
 			txHash,
 			built,
 			skipped,
+			deployResults,
 			publishConfig: publishPayload
 		};
 	} catch (error) {
 		return {
 			status: "error",
 			registryUrl,
-			error: error instanceof Error ? error.message : "Unknown error",
+			error: formatNearError(error),
 			built,
-			skipped
+			skipped,
+			deployResults
 		};
 	}
 }
+function formatNearError(error) {
+	const message = error instanceof Error ? error.message : String(error);
+	if (message.includes("exceeded gas") || message.includes("GasLimitExceeded")) return `Transaction exceeded gas limit.\n  Original: ${message}`;
+	if (message.includes("timeout") || message.includes("Timeout")) return `Transaction timed out. Check NEAR network status.\n  Original: ${message}`;
+	return message;
+}
 function extractTransactionHash(error) {
 	return (error instanceof Error ? error.message : String(error)).match(/Transaction ID:\s*([A-Za-z0-9]+)/i)?.[1];
 }