everything-dev 1.44.0 → 1.45.0

package/dist/plugin.mjs

@@ -5,7 +5,7 @@ import { BosConfigSchema } from "./types.mjs";
 import { buildRuntimePluginsForConfig, drainConfigWarnings, findConfigPath, getHostDevelopmentPort, getProjectRoot, loadLocalConfig, loadResolvedConfig, resolveConfigComposableEntries, resolveLocalDevelopmentPath, resumeWarnings, suppressWarnings, writeResolvedConfig } from "./config.mjs";
 import { createPlugin, z } from "./sdk.mjs";
 import { bosContract } from "./contract.mjs";
-import { computeSriHashForUrl } from "./integrity.mjs";
+import { applyDeployResults, cleanDeployResultDir, computeSriHashForUrl, readAllDeployResults, readDeployResults } from "./integrity.mjs";
 import { syncApiContractBridge } from "./api-contract.mjs";
 import { buildRuntimeConfig, detectLocalPackages, prepareDevelopmentRuntimeConfig } from "./app.mjs";
 import { ensureEnvFile, loadProjectEnv, syncGeneratedInfra, writeGeneratedInfra } from "./cli/infra.mjs";
@@ -15,11 +15,11 @@ import { getStatus } from "./cli/status.mjs";
 import { syncResolvedSharedDeps } from "./shared-deps.mjs";
 import { syncTemplate } from "./cli/sync.mjs";
 import { upgradeTemplate } from "./cli/upgrade.mjs";
-import { colors } from "./utils/theme.mjs";
+import { colors, icons } from "./utils/theme.mjs";
 import { addFunctionCallAccessKey, ensureNearCli, executeTransaction, resolveNearSigningMode } from "./near-cli.mjs";
 import { buildDescription, buildServiceDescriptorMap } from "./service-descriptor.mjs";
 import { run } from "./utils/run.mjs";
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, resolve } from "node:path";
 import { Effect } from "effect";
 import { EventEmitter } from "node:events";
@@ -227,9 +227,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 run("bun", [
 		"run",
 		"--cwd",
@@ -239,17 +239,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()) process.stdout.write(result.stdout);
 	if (result.stderr.trim()) process.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 run("bun", [
 		"run",
 		"--cwd",
@@ -259,10 +256,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()) process.stdout.write(result.stdout);
 	if (result.stderr.trim()) process.stderr.write(result.stderr);
 	throw new Error(`bun run --cwd packages/everything-dev build failed with exit code ${result.exitCode}`);
@@ -295,6 +289,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 run(cmd, args, {
+			cwd,
+			env,
+			capture: false
+		});
+		if (resultBaseDir) {
+			const results = readDeployResults(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 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 = readDeployResults(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 = 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(`  ${colors.yellow("↻")} ${padRight(ws.key, 28)} retrying...`);
+		if (resultBaseDir) {
+			const wsResultDir = join(resultBaseDir, ws.key);
+			if (existsSync(wsResultDir)) 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(`  ${colors.green(icons.ok)} ${name} ${colors.dim(duration + retryTag)}`);
+		} else {
+			const errorLine = (result.error ?? "Failed").split("\n")[0];
+			console.log(`  ${colors.error(icons.err)} ${name} ${errorLine}`);
+		}
+	}
+	return result;
+}
 async function buildWorkspaceTargets(opts) {
 	const existing = [];
 	const skipped = [];
@@ -317,26 +446,74 @@ async function buildWorkspaceTargets(opts) {
 		bosConfig: opts.bosConfig ?? void 0,
 		extendsChain: []
 	})).catalogChanged) await run("bun", ["install"], { cwd: opts.configDir });
-	if (existing.some((entry) => entry.key === "api")) await buildEveryPluginQuietly(opts.configDir);
-	await buildEverythingDevQuietly(opts.configDir);
+	const shouldBuildPlugin = existing.some((entry) => entry.key === "api");
+	const forceRebuild = opts.deploy;
+	const buildTasks = [buildEverythingDevQuietly(opts.configDir, forceRebuild)];
+	if (shouldBuildPlugin) buildTasks.push(buildEveryPluginQuietly(opts.configDir, forceRebuild));
+	await Promise.all(buildTasks);
 	const env = {
 		...process.env,
 		NODE_ENV: opts.deploy ? "production" : "development"
 	};
 	if (opts.deploy) env.DEPLOY = "true";
 	else delete env.DEPLOY;
+	const resultBaseDir = opts.deploy ? join(opts.configDir, ".bos", "deploy-results") : void 0;
+	if (resultBaseDir) cleanDeployResultDir(resultBaseDir);
+	const bosConfigPath = join(opts.configDir, "bos.config.json");
+	let configSnapshot;
+	if (opts.deploy && existsSync(bosConfigPath)) configSnapshot = 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 = readAllDeployResults(resultBaseDir);
+			if (allResults.length > 0) {
+				const merged = applyDeployResults(JSON.parse(configSnapshot), allResults);
+				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 && existsSync(bosConfigPath)) {
+			const allResults = readAllDeployResults(resultBaseDir);
+			const currentConfig = JSON.parse(readFileSync(bosConfigPath, "utf-8"));
+			const hostResults = allResults.filter((r) => r.urlField.startsWith("app.host"));
+			if (hostResults.length > 0) {
+				const merged = applyDeployResults(currentConfig, hostResults);
+				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"]
 		};
@@ -348,7 +525,8 @@ async function buildWorkspaceTargets(opts) {
 	}
 	return {
 		built,
-		skipped
+		skipped,
+		deployResults: opts.deploy ? deployResults : void 0
 	};
 }
 var plugin_default = createPlugin({
@@ -521,12 +699,9 @@ var plugin_default = createPlugin({
 			};
 		}),
 		dev: builder.dev.handler(async ({ input }) => {
+			const devTimings = [];
 			ensureEnvFile(deps.configDir);
 			loadProjectEnv(deps.configDir);
-			pluginEvents.emit("progress", {
-				phase: "config",
-				status: "running"
-			});
 			const localPackages = detectLocalPackages(deps.bosConfig ?? void 0, deps.runtimeConfig ?? void 0);
 			const hostSource = localPackages.includes("host") ? parseSourceMode(input.host, "local") : "remote";
 			const uiSource = localPackages.includes("ui") ? parseSourceMode(input.ui, "local") : "remote";
@@ -534,61 +709,44 @@ var plugin_default = createPlugin({
 			const authSource = localPackages.includes("auth") ? parseSourceMode(input.auth, "local") : "remote";
 			const ssr = input.ssr ?? false;
 			const proxy = input.proxy ?? false;
-			if ((await syncResolvedSharedDeps({
+			const sharedSync = await timePhase(devTimings, "shared deps", () => syncResolvedSharedDeps({
 				configDir: deps.configDir,
 				hostMode: hostSource,
 				bosConfig: deps.bosConfig ?? void 0,
 				extendsChain: []
-			})).catalogChanged) {
-				pluginEvents.emit("progress", {
-					phase: "install",
-					status: "running"
-				});
-				await run("bun", ["install"], { cwd: deps.configDir });
-				pluginEvents.emit("progress", {
-					phase: "install",
-					status: "done"
-				});
-			}
-			if (apiSource === "local" && !proxy || localPackages.some((pkg) => pkg.startsWith("plugin:"))) {
-				pluginEvents.emit("progress", {
-					phase: "build plugin",
-					status: "running"
-				});
-				await buildEveryPluginQuietly(deps.configDir);
-				pluginEvents.emit("progress", {
-					phase: "build plugin",
-					status: "done"
-				});
+			}));
+			let configMayHaveChanged = false;
+			if (sharedSync.catalogChanged) {
+				await timePhase(devTimings, "install", () => run("bun", ["install"], { cwd: deps.configDir }));
+				configMayHaveChanged = true;
 			}
-			pluginEvents.emit("progress", {
-				phase: "build",
-				status: "running"
-			});
-			await buildEverythingDevQuietly(deps.configDir);
-			pluginEvents.emit("progress", {
-				phase: "build",
-				status: "done"
-			});
-			pluginEvents.emit("progress", {
-				phase: "config",
-				status: "done"
+			const shouldBuildPlugin = apiSource === "local" && !proxy || localPackages.some((pkg) => pkg.startsWith("plugin:"));
+			await timePhase(devTimings, "build", async () => {
+				const buildTasks = [buildEverythingDevQuietly(deps.configDir)];
+				if (shouldBuildPlugin) buildTasks.push(buildEveryPluginQuietly(deps.configDir));
+				await Promise.all(buildTasks);
 			});
-			const refreshed = await loadResolvedConfig({
-				cwd: deps.configDir,
-				remotePlugins: input.remotePlugins
-			});
-			deps.bosConfig = refreshed?.config ?? deps.bosConfig;
-			deps.runtimeConfig = refreshed?.runtime ?? deps.runtimeConfig;
+			let devExtendsChain;
+			if (configMayHaveChanged || input.remotePlugins?.length) {
+				const refreshed = await timePhase(devTimings, "resolve config", () => loadResolvedConfig({
+					cwd: deps.configDir,
+					remotePlugins: input.remotePlugins
+				}));
+				deps.bosConfig = refreshed?.config ?? deps.bosConfig;
+				deps.runtimeConfig = refreshed?.runtime ?? deps.runtimeConfig;
+				devExtendsChain = refreshed?.source.extended;
+			}
 			if (!deps.bosConfig) return {
 				status: "error",
 				description: "No bos.config.json found",
-				processes: []
+				processes: [],
+				timings: devTimings
 			};
 			if (proxy && !resolveProxyUrl(deps.bosConfig)) return {
 				status: "error",
 				description: "No valid proxy URL configured in bos.config.json",
-				processes: []
+				processes: [],
+				timings: devTimings
 			};
 			const hostPort = input.port ?? getHostDevelopmentPort(deps.bosConfig.app.host.development);
 			suppressWarnings();
@@ -602,20 +760,18 @@ var plugin_default = createPlugin({
 			});
 			drainConfigWarnings();
 			resumeWarnings();
-			const runtimeConfig = await prepareDevelopmentRuntimeConfig(developmentRuntime, {
+			const runtimeConfig = await timePhase(devTimings, "ports", () => prepareDevelopmentRuntimeConfig(developmentRuntime, {
 				hostPort,
 				ssr
-			});
+			}));
 			syncGeneratedInfra(deps.configDir, runtimeConfig);
-			if (!existsSync(join(deps.configDir, ".env"))) {
-				ensureEnvFile(deps.configDir);
-				loadProjectEnv(deps.configDir);
-			}
-			await generateCodeArtifacts(deps.configDir, deps.bosConfig, {
+			ensureEnvFile(deps.configDir);
+			loadProjectEnv(deps.configDir);
+			await timePhase(devTimings, "generate artifacts", () => generateCodeArtifacts(deps.configDir, deps.bosConfig, {
 				env: "development",
-				extendsChain: refreshed?.source.extended,
+				extendsChain: devExtendsChain,
 				runtimeConfig
-			});
+			}));
 			const services = buildServiceDescriptorMap(runtimeConfig, {
 				ssr,
 				proxy
@@ -647,7 +803,8 @@ var plugin_default = createPlugin({
 			return {
 				status: "started",
 				description: orchestrator.description,
-				processes: packages
+				processes: packages,
+				timings: devTimings
 			};
 		}),
 		start: builder.start.handler(async ({ input }) => {
@@ -708,10 +865,8 @@ var plugin_default = createPlugin({
 			if (isStaging && config.staging?.domain) runtimeConfig.domain = config.staging.domain;
 			if (isStaging) runtimeConfig.env = "staging";
 			syncGeneratedInfra(deps.configDir, runtimeConfig);
-			if (!existsSync(join(deps.configDir, ".env"))) {
-				ensureEnvFile(deps.configDir);
-				loadProjectEnv(deps.configDir);
-			}
+			ensureEnvFile(deps.configDir);
+			loadProjectEnv(deps.configDir);
 			pluginEvents.emit("progress", {
 				phase: "generate artifacts",
 				status: "running"
@@ -843,6 +998,7 @@ var plugin_default = createPlugin({
 				env: input.env,
 				build: input.deploy,
 				dryRun: input.dryRun,
+				verbose: input.verbose,
 				packages: input.packages,
 				network: input.network,
 				privateKey: input.privateKey
@@ -860,7 +1016,8 @@ var plugin_default = 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 }) => {
@@ -877,6 +1034,7 @@ var plugin_default = createPlugin({
 				env: input.env,
 				build: input.build,
 				dryRun: input.dryRun,
+				verbose: input.verbose,
 				packages: input.packages,
 				network: input.network,
 				privateKey: input.privateKey
@@ -888,7 +1046,8 @@ var plugin_default = 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",
@@ -918,6 +1077,7 @@ var plugin_default = 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"
 					};
 				}
@@ -948,6 +1108,7 @@ var plugin_default = createPlugin({
 						skipped: result.skipped,
 						redeployed: false,
 						service,
+						deployResults: result.deployResults,
 						error: `Config published but ${railError}`
 					};
 				}
@@ -962,7 +1123,8 @@ var plugin_default = createPlugin({
 				built: result.built,
 				skipped: result.skipped,
 				redeployed,
-				service
+				service,
+				deployResults: result.deployResults
 			};
 		}),
 		keyPublish: builder.keyPublish.handler(async ({ input }) => {
@@ -1039,6 +1201,17 @@ var plugin_default = createPlugin({
 				overrides = overrides?.length ? overrides : ["ui", "api"];
 				if (overrides.includes("plugins") && plugins === void 0) plugins = parentPluginKeys;
 				plugins = plugins ?? [];
+				const pluginDirMap = {};
+				if (parentConfig?.plugins) for (const plugin of plugins) {
+					const entry = parentConfig.plugins?.[plugin];
+					if (entry && typeof entry === "object") {
+						const dev = entry.development;
+						if (typeof dev === "string") {
+							const match = dev.match(/^local:plugins\/(.+)$/);
+							if (match?.[1] && match[1] !== plugin) pluginDirMap[plugin] = match[1];
+						}
+					}
+				}
 				directory = directory || domain || extendsGateway;
 				const targetDir = resolve(directory);
 				const extendsRef = `bos://${extendsAccount}/${extendsGateway}`;
@@ -1096,7 +1269,7 @@ var plugin_default = createPlugin({
 							staging: parentConfig?.staging
 						}));
 					} else {
-						const patterns = buildInitPatterns(overrides, plugins);
+						const patterns = buildInitPatterns(overrides, plugins, pluginDirMap);
 						filesCopied = await timePhase(timings, "copy files", () => copyFilteredFiles(sourceDir, targetDir, patterns, {
 							overrides,
 							plugins
@@ -1384,13 +1557,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 || process.env.NEAR_PRIVATE_KEY || process.env.BOS_NEAR_PRIVATE_KEY;
+	let signingMode;
+	try {
+		signingMode = 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.runPromise(ensureNearCli);
+		console.log("  NEAR CLI ready");
 		await generateCodeArtifacts(configDir, bosConfig, {
 			env: "production",
 			runtimeConfig: runtimeConfig ?? void 0
@@ -1400,16 +1588,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(colors.error(`  ${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(`    ${colors.error(icons.err)} ${padRight(f.key, 28)} ${errorLine}`);
+				}
+				console.log();
+				if (!input.verbose) {
+					console.log(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 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;
@@ -1423,28 +1640,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 || process.env.NEAR_PRIVATE_KEY || process.env.BOS_NEAR_PRIVATE_KEY;
-	let signingMode;
-	try {
-		signingMode = resolveNearSigningMode(privateKey);
-	} catch (error) {
-		return {
-			status: "error",
-			registryUrl,
-			error: error instanceof Error ? error.message : "Unknown error"
-		};
-	}
 	console.log();
 	console.log("  Publishing to:");
 	console.log(`    ${colors.cyan(registryUrl)}`);
 	try {
-		console.log("  Ensuring NEAR CLI...");
-		await Effect.runPromise(ensureNearCli);
-		console.log("  NEAR CLI ready");
 		let txHash;
 		console.log(`  Submitting transaction on ${network}...`);
 		try {
-			txHash = (await Effect.runPromise(executeTransaction({
+			const tx = await Effect.runPromise(executeTransaction({
 				account,
 				contract: getRegistryNamespaceForNetwork(network),
 				method: "__fastdata_kv",
@@ -1452,12 +1655,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: ${colors.dim(txHash)}`);
+				deposit: "0NEAR",
+				verbose: input.verbose
+			}, signingMode));
+			txHash = tx.txHash;
+			if (txHash && !tx.output?.includes("CodeDoesNotExist")) console.log(`  Transaction submitted: ${colors.dim(txHash)}`);
 		} catch (error) {
-			txHash = extractTransactionHash(error);
-			if (!txHash) throw error;
+			console.log(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({
@@ -1471,18 +1687,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];
 }