everything-dev 1.29.0 → 1.31.0

package/dist/plugin.cjs

@@ -200,7 +200,8 @@ async function generateCodeArtifacts(configDir, config, opts) {
 	return {
 		sidebarPath: (0, node_path.join)(configDir, "ui/src/lib/plugin-sidebar.gen.ts"),
 		resolvedConfigPath: opts?.env ? (0, node_path.join)(configDir, ".bos/bos.resolved-config.json") : void 0,
-		contractBridgePath: bridge.bridgePath
+		contractBridgePath: bridge.bridgePath,
+		contractStatus: bridge.status
 	};
 }
 function extractPublishedUrl(output) {
@@ -251,8 +252,9 @@ async function buildEverythingDevQuietly(cwd) {
 async function fetchPublishedConfig(accountId, gatewayId) {
 	try {
 		return await require_fastkv.fetchBosConfigFromFastKv(`bos://${accountId}/${gatewayId}`);
-	} catch {
-		return null;
+	} catch (error) {
+		if (error instanceof Error && error.message.startsWith("No config found")) return null;
+		throw error;
 	}
 }
 function selectWorkspaceTargets(packages, bosConfig) {
@@ -613,20 +615,31 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				phase: "config",
 				status: "running"
 			});
+			const bosEnv = input.env ?? (node_process.default.env.BOS_ENV === "staging" ? "staging" : "production");
 			const account = input.account ?? node_process.default.env.BOS_ACCOUNT;
 			const domain = input.domain ?? node_process.default.env.BOS_GATEWAY;
 			let config = null;
 			let remoteConfig = null;
-			if (account && domain) {
+			if (account && domain) try {
 				remoteConfig = await fetchPublishedConfig(account, domain);
 				if (remoteConfig) config = remoteConfig;
-				else console.warn(`[Start] Failed to fetch remote config for ${account}/${domain}, falling back to local bos.config.json`);
+				else return {
+					status: "error",
+					url: "",
+					error: `No config found at bos://${account}/${domain}. Verify the account and gateway are correct and the config has been published.\nExpected URL: ${require_fastkv.buildRegistryConfigUrl(account, domain)}`
+				};
+			} catch (error) {
+				return {
+					status: "error",
+					url: "",
+					error: `Failed to fetch config for bos://${account}/${domain}: ${error instanceof Error ? error.message : "Unknown error"}\nExpected URL: ${require_fastkv.buildRegistryConfigUrl(account, domain)}`
+				};
 			}
-			if (!config) config = deps.bosConfig;
+			else config = deps.bosConfig;
 			if (!config) return {
 				status: "error",
 				url: "",
-				error: "No configuration found. Set BOS_ACCOUNT and BOS_GATEWAY environment variables, or provide a local bos.config.json."
+				error: "No configuration found. Provide --account and --gateway flags, or create a local bos.config.json."
 			};
 			if (account) config = {
 				...config,
@@ -637,7 +650,7 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				domain
 			};
 			const port = input.port ?? require_config.getHostDevelopmentPort(config.app.host.development);
-			const isStaging = input.env === "staging";
+			const isStaging = bosEnv === "staging";
 			const runtimePlugins = await require_config.buildRuntimePluginsForConfig(config, deps.configDir, "production");
 			require_config.suppressWarnings();
 			const runtimeConfig = require_app.buildRuntimeConfig(config, {
@@ -650,6 +663,8 @@ var plugin_default = (0, every_plugin.createPlugin)({
 			});
 			require_config.drainConfigWarnings();
 			require_config.resumeWarnings();
+			if (isStaging && config.staging?.domain) runtimeConfig.domain = config.staging.domain;
+			if (isStaging) runtimeConfig.env = "staging";
 			require_infra.syncGeneratedInfra(deps.configDir, runtimeConfig);
 			if (!(0, node_fs.existsSync)((0, node_path.join)(deps.configDir, ".env"))) {
 				require_infra.ensureEnvFile(deps.configDir);
@@ -670,12 +685,13 @@ var plugin_default = (0, every_plugin.createPlugin)({
 			const productionEnv = {};
 			const warnings = [];
 			if (!node_process.default.env.CORS_ORIGIN && config.domain) {
-				const defaultOrigin = `https://${config.domain}`;
+				const defaultOrigin = `https://${isStaging ? config.staging?.domain ?? config.domain : config.domain}`;
 				productionEnv.CORS_ORIGIN = defaultOrigin;
 				warnings.push(`CORS_ORIGIN defaulting to ${defaultOrigin}`);
 			}
 			const requiredSecrets = /* @__PURE__ */ new Set();
 			const missingSecrets = [];
+			if (runtimeConfig.host.secrets) for (const s of runtimeConfig.host.secrets) requiredSecrets.add(s);
 			if (runtimeConfig.auth?.secrets) for (const s of runtimeConfig.auth.secrets) requiredSecrets.add(s);
 			if (runtimeConfig.api?.secrets) for (const s of runtimeConfig.api.secrets) requiredSecrets.add(s);
 			for (const plugin of Object.values(runtimeConfig.plugins ?? {})) if (plugin.secrets) for (const s of plugin.secrets) requiredSecrets.add(s);
@@ -778,89 +794,120 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				registryUrl: "",
 				error: "No bos.config.json found"
 			};
-			const account = deps.bosConfig.account;
-			const gateway = deps.bosConfig.domain;
-			if (!gateway) return {
+			const result = await publishToFastKv({
+				bosConfig: deps.bosConfig,
+				runtimeConfig: deps.runtimeConfig,
+				configDir: deps.configDir,
+				env: input.env,
+				build: input.deploy,
+				dryRun: input.dryRun,
+				packages: input.packages,
+				network: input.network,
+				privateKey: input.privateKey
+			});
+			if (result.publishConfig) {
+				const refreshed = await require_config.loadResolvedConfig({ cwd: deps.configDir });
+				if (refreshed?.config) {
+					deps.bosConfig = refreshed.config;
+					deps.runtimeConfig = refreshed.runtime;
+				}
+			}
+			return {
+				status: result.status,
+				registryUrl: result.registryUrl,
+				txHash: result.txHash,
+				error: result.error,
+				built: result.built,
+				skipped: result.skipped
+			};
+		}),
+		deploy: builder.deploy.handler(async ({ input }) => {
+			if (!deps.bosConfig) return {
 				status: "error",
 				registryUrl: "",
-				error: "bos.config.json must define domain to publish"
+				redeployed: false,
+				error: "No bos.config.json found"
 			};
-			const network = input.network ?? require_network.getNetworkIdForAccount(account);
-			const bosUrl = `bos://${account}/${gateway}`;
-			const registryUrl = require_fastkv.buildRegistryConfigUrlForNetwork(network, account, gateway);
-			const targets = selectWorkspaceTargets(input.packages, deps.bosConfig);
-			let publishConfig = deps.bosConfig;
-			let built;
-			let skipped;
-			if (input.dryRun) return {
+			const result = await publishToFastKv({
+				bosConfig: deps.bosConfig,
+				runtimeConfig: deps.runtimeConfig,
+				configDir: deps.configDir,
+				env: input.env,
+				build: input.build,
+				dryRun: input.dryRun,
+				packages: input.packages,
+				network: input.network,
+				privateKey: input.privateKey
+			});
+			if (result.status === "error") return {
+				status: "error",
+				registryUrl: result.registryUrl,
+				txHash: result.txHash,
+				built: result.built,
+				skipped: result.skipped,
+				redeployed: false,
+				error: result.error
+			};
+			if (result.status === "dry-run") return {
 				status: "dry-run",
-				registryUrl,
-				built,
-				skipped
+				registryUrl: result.registryUrl,
+				built: result.built,
+				skipped: result.skipped,
+				redeployed: false
 			};
-			if (input.deploy) {
-				await generateCodeArtifacts(deps.configDir, deps.bosConfig, {
-					env: "production",
-					runtimeConfig: deps.runtimeConfig ?? void 0
-				});
-				const result = await buildWorkspaceTargets({
-					configDir: deps.configDir,
-					bosConfig: deps.bosConfig,
-					runtimeConfig: deps.runtimeConfig,
-					targets,
-					deploy: true
-				});
-				built = result.built;
-				skipped = result.skipped;
+			if (result.publishConfig) {
 				const refreshed = await require_config.loadResolvedConfig({ cwd: deps.configDir });
 				if (refreshed?.config) {
 					deps.bosConfig = refreshed.config;
 					deps.runtimeConfig = refreshed.runtime;
-					publishConfig = refreshed.config;
 				}
 			}
-			const registryEntries = { [`apps/${account}/${gateway}/bos.config.json`]: JSON.stringify(publishConfig) };
-			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;
-			try {
-				await effect.Effect.runPromise(require_near_cli.ensureNearCli);
-				let txHash;
+			let redeployed = false;
+			let service;
+			if (node_process.default.env.RAILWAY_TOKEN) {
+				const railwayService = input.service ?? deps.bosConfig.ci?.railway?.service;
+				if (!railwayService) return {
+					status: "published",
+					registryUrl: result.registryUrl,
+					txHash: result.txHash,
+					built: result.built,
+					skipped: result.skipped,
+					redeployed: false,
+					error: "Config published but Railway redeploy failed: ci.railway.service is not configured in bos.config.json"
+				};
+				service = railwayService;
 				try {
-					txHash = (await effect.Effect.runPromise(require_near_cli.executeTransaction({
-						account,
-						contract: require_fastkv.getRegistryNamespaceForNetwork(network),
-						method: "__fastdata_kv",
-						argsBase64,
-						network,
-						privateKey,
-						gas: "300Tgas",
-						deposit: "0NEAR"
-					}))).txHash;
+					await require_run.run("railway", [
+						"redeploy",
+						"--service",
+						railwayService,
+						"--yes"
+					]);
+					redeployed = true;
 				} catch (error) {
-					txHash = extractTransactionHash(error);
-					if (!txHash) throw error;
-					try {
-						const verifiedConfig = await require_fastkv.fetchBosConfigFromFastKv(bosUrl);
-						if (JSON.stringify(verifiedConfig) !== JSON.stringify(publishConfig)) throw error;
-					} catch {}
+					const message = error instanceof Error ? error.message : String(error);
+					const railError = message.includes("not found") || message.includes("ENOENT") ? "Railway CLI not found. Install it: npm i -g @railway/cli" : `Railway redeploy failed: ${message}`;
+					return {
+						status: "published",
+						registryUrl: result.registryUrl,
+						txHash: result.txHash,
+						built: result.built,
+						skipped: result.skipped,
+						redeployed: false,
+						service,
+						error: `Config published but ${railError}`
+					};
 				}
-				return {
-					status: "published",
-					registryUrl,
-					txHash,
-					built,
-					skipped
-				};
-			} catch (error) {
-				return {
-					status: "error",
-					registryUrl,
-					error: error instanceof Error ? error.message : "Unknown error",
-					built,
-					skipped
-				};
 			}
+			return {
+				status: "deployed",
+				registryUrl: result.registryUrl,
+				txHash: result.txHash,
+				built: result.built,
+				skipped: result.skipped,
+				redeployed,
+				service
+			};
 		}),
 		keyPublish: builder.keyPublish.handler(async ({ input }) => {
 			if (!deps.bosConfig) return {
@@ -1136,18 +1183,16 @@ var plugin_default = (0, every_plugin.createPlugin)({
 					const pluginEntries = Object.entries(refreshed.runtime.plugins ?? {});
 					const fetched = [];
 					const skipped = [];
-					if (refreshed.runtime.api.source !== "local") fetched.push(refreshed.runtime.api.url);
+					const hasLocalApiWorkspace = (0, node_fs.existsSync)((0, node_path.join)(projectDir, "api", "src"));
+					if (refreshed.runtime.api.source !== "local") fetched.push(`api (${refreshed.runtime.api.url})`);
 					else skipped.push("api (local)");
-					if (refreshed.runtime.auth) if (refreshed.runtime.auth.source !== "local") fetched.push(refreshed.runtime.auth.url);
+					if (refreshed.runtime.auth) if (refreshed.runtime.auth.source !== "local") fetched.push(`auth (${refreshed.runtime.auth.url})`);
 					else skipped.push("auth (local)");
-					for (const [key, plugin] of pluginEntries) if (plugin.url && plugin.source !== "local") fetched.push(plugin.url);
+					for (const [key, plugin] of pluginEntries) if (plugin.url && plugin.source !== "local") fetched.push(`${key} (${plugin.url})`);
 					else if (plugin.localPath) skipped.push(`${key} (local)`);
-					const generated = [
-						"ui/src/lib/api-types.gen.ts",
-						"ui/src/lib/auth-types.gen.ts",
-						"api/src/lib/plugins-types.gen.ts",
-						"api/src/lib/auth-types.gen.ts"
-					];
+					else skipped.push(`${key} (no URL resolved)`);
+					const generated = ["ui/src/lib/api-types.gen.ts", "ui/src/lib/auth-types.gen.ts"];
+					if (hasLocalApiWorkspace) generated.push("api/src/lib/plugins-types.gen.ts", "api/src/lib/auth-types.gen.ts");
 					if ((0, node_fs.existsSync)((0, node_path.join)(projectDir, "host", "src"))) generated.push("host/src/lib/auth-types.gen.ts");
 					return {
 						status: "success",
@@ -1158,21 +1203,29 @@ var plugin_default = (0, every_plugin.createPlugin)({
 						source: refreshed.runtime.api.source
 					};
 				}
-				await generateCodeArtifacts(projectDir, refreshed.config, { runtimeConfig: refreshed.runtime });
-				const generated = [
-					"ui/src/lib/plugin-sidebar.gen.ts",
-					"ui/src/lib/api-types.gen.ts",
-					"api/src/lib/plugins-types.gen.ts",
-					"api/src/lib/auth-types.gen.ts"
-				];
+				const artifacts = await generateCodeArtifacts(projectDir, refreshed.config, { runtimeConfig: refreshed.runtime });
+				const hasLocalApiWorkspace = (0, node_fs.existsSync)((0, node_path.join)(projectDir, "api", "src"));
+				const generated = ["ui/src/lib/plugin-sidebar.gen.ts", "ui/src/lib/api-types.gen.ts"];
+				if (hasLocalApiWorkspace) generated.push("api/src/lib/plugins-types.gen.ts", "api/src/lib/auth-types.gen.ts");
 				if (refreshed.runtime.auth && (refreshed.runtime.auth.source !== "local" || refreshed.runtime.auth.localPath)) generated.push("ui/src/lib/auth-types.gen.ts");
 				if ((0, node_fs.existsSync)((0, node_path.join)(projectDir, "host", "src"))) generated.push("host/src/lib/auth-types.gen.ts");
+				const contractStatus = artifacts?.contractStatus ?? [];
+				const fetched = [];
+				const skipped = [];
+				const failed = [];
+				for (const entry of contractStatus) if (entry.source === "remote") fetched.push(entry.url ? `${entry.key} (${entry.url})` : entry.key);
+				else if (entry.source === "local") skipped.push(`${entry.key} (local)`);
+				else if (entry.source === "skipped") skipped.push(`${entry.key} (no URL resolved)`);
+				else if (entry.source === "failed") {
+					const detail = entry.error ? `: ${entry.error}` : "";
+					failed.push(`${entry.key}${detail}`);
+				}
 				return {
 					status: "success",
 					generated,
-					fetched: refreshed.runtime.api.source === "remote" ? [refreshed.runtime.api.url] : [],
-					skipped: refreshed.runtime.api.source === "local" ? ["api (local)"] : [],
-					failed: [],
+					fetched,
+					skipped,
+					failed,
 					source: refreshed.runtime.api.source
 				};
 			} catch (error) {
@@ -1207,6 +1260,100 @@ var plugin_default = (0, every_plugin.createPlugin)({
 		})
 	})
 });
+async function publishToFastKv(input) {
+	const { env, dryRun, configDir } = input;
+	let bosConfig = input.bosConfig;
+	const runtimeConfig = input.runtimeConfig;
+	const isStaging = env === "staging";
+	const account = bosConfig.account;
+	const gateway = isStaging ? bosConfig.staging?.domain ?? bosConfig.domain : bosConfig.domain;
+	if (!gateway) return {
+		status: "error",
+		registryUrl: "",
+		error: "bos.config.json must define domain to publish"
+	};
+	const network = input.network ?? require_network.getNetworkIdForAccount(account);
+	const registryUrl = require_fastkv.buildRegistryConfigUrlForNetwork(network, account, gateway);
+	const targets = selectWorkspaceTargets(input.packages, bosConfig);
+	let publishConfig = isStaging ? {
+		...bosConfig,
+		domain: gateway
+	} : bosConfig;
+	let built;
+	let skipped;
+	if (dryRun) return {
+		status: "dry-run",
+		registryUrl,
+		built,
+		skipped
+	};
+	if (input.build) {
+		await generateCodeArtifacts(configDir, bosConfig, {
+			env: "production",
+			runtimeConfig: runtimeConfig ?? void 0
+		});
+		const result = await buildWorkspaceTargets({
+			configDir,
+			bosConfig,
+			runtimeConfig,
+			targets,
+			deploy: true
+		});
+		built = result.built;
+		skipped = result.skipped;
+		const refreshed = await require_config.loadResolvedConfig({ cwd: configDir });
+		if (refreshed?.config) {
+			bosConfig = refreshed.config;
+			publishConfig = isStaging ? {
+				...refreshed.config,
+				domain: gateway
+			} : refreshed.config;
+		}
+	}
+	const registryEntries = { [`apps/${account}/${gateway}/bos.config.json`]: JSON.stringify(publishConfig) };
+	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;
+	try {
+		await effect.Effect.runPromise(require_near_cli.ensureNearCli);
+		let txHash;
+		try {
+			txHash = (await effect.Effect.runPromise(require_near_cli.executeTransaction({
+				account,
+				contract: require_fastkv.getRegistryNamespaceForNetwork(network),
+				method: "__fastdata_kv",
+				argsBase64,
+				network,
+				privateKey,
+				gas: "300Tgas",
+				deposit: "0NEAR"
+			}))).txHash;
+		} catch (error) {
+			txHash = extractTransactionHash(error);
+			if (!txHash) throw error;
+			try {
+				const verifiedConfig = await require_fastkv.fetchBosConfigFromFastKv(`bos://${account}/${gateway}`);
+				if (JSON.stringify(verifiedConfig) !== JSON.stringify(publishConfig)) throw error;
+			} catch {}
+		}
+		return {
+			status: "published",
+			registryUrl,
+			txHash,
+			built,
+			skipped,
+			publishConfig
+		};
+	} catch (error) {
+		return {
+			status: "error",
+			registryUrl,
+			error: error instanceof Error ? error.message : "Unknown error",
+			built,
+			skipped
+		};
+	}
+}
 function extractTransactionHash(error) {
 	return (error instanceof Error ? error.message : String(error)).match(/Transaction ID:\s*([A-Za-z0-9]+)/i)?.[1];
 }