everything-dev 1.26.1 → 1.28.0

package/dist/plugin.mjs

@@ -1,34 +1,69 @@
 import { buildRegistryConfigUrl, buildRegistryConfigUrlForNetwork, fetchBosConfigFromFastKv, fetchRemotePluginManifest, getRegistryNamespaceForAccount, getRegistryNamespaceForNetwork } from "./fastkv.mjs";
 import { getNetworkIdForAccount } from "./network.mjs";
-import { createPlugin, z } from "./sdk.mjs";
 import { buildRuntimePluginsForConfig, findConfigPath, getHostDevelopmentPort, getProjectRoot, loadConfig, resolveLocalDevelopmentPath, writeResolvedConfig } from "./config.mjs";
+import { createPlugin, z } from "./sdk.mjs";
 import { bosContract } from "./contract.mjs";
+import { writePluginSidebarGen } from "./sidebar.mjs";
+import { computeSriHashForUrl } from "./integrity.mjs";
 import { syncApiContractBridge } from "./api-contract.mjs";
 import { buildRuntimeConfig, detectLocalPackages, prepareDevelopmentRuntimeConfig } from "./app.mjs";
 import { ensureEnvFile, writeGeneratedInfra } from "./cli/infra.mjs";
 import { saveBosConfig } from "./utils/save-config.mjs";
-import { copyFilteredFiles, detectGitRemoteUrl, fetchParentConfig, generateDatabaseMigrations, personalizeConfig, readTemplatekeep, removeInitLockfile, resolveSourceDir, runBunInstall, runDockerComposeUp, runTypesGen, scaffoldMinimalProject, stripOrphanedWorkspacesFromLockfile, writeInitSnapshot } from "./cli/init.mjs";
-import { promptInitOptions } from "./cli/prompts.mjs";
+import { buildInitPatterns, copyFilteredFiles, detectGitRemoteUrl, fetchParentConfig, generateDatabaseMigrations, personalizeConfig, removeInitLockfile, resolveSourceDir, runBunInstall, runTypesGen, scaffoldMinimalProject, stripOrphanedWorkspacesFromLockfile, writeInitSnapshot } from "./cli/init.mjs";
 import { getStatus } from "./cli/status.mjs";
 import { syncTemplate } from "./cli/sync.mjs";
-import { timePhase } from "./cli/timing.mjs";
 import { upgradeTemplate } from "./cli/upgrade.mjs";
-import { computeSriHashForUrl } from "./integrity.mjs";
 import { addFunctionCallAccessKey, ensureNearCli, executeTransaction } from "./near-cli.mjs";
 import { buildDescription, buildServiceDescriptorMap } from "./service-descriptor.mjs";
 import { syncAndGenerateSharedUi } from "./shared.mjs";
-import { writePluginSidebarGen } from "./sidebar.mjs";
 import { run } from "./utils/run.mjs";
-import { colors } from "./utils/theme.mjs";
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, resolve } from "node:path";
+import { EventEmitter } from "node:events";
 import process from "node:process";
-import * as p from "@clack/prompts";
 import { Effect } from "effect";
 
 //#region src/plugin.ts
-async function loadDevSession() {
-	return import("./dev-session.mjs");
+const pluginEvents = new EventEmitter();
+let pendingSession = null;
+let pendingStartSummary = null;
+function consumeDevSession() {
+	const data = pendingSession;
+	const summary = pendingStartSummary;
+	pendingSession = null;
+	pendingStartSummary = null;
+	if (!data) return null;
+	return summary ? {
+		...data,
+		summary
+	} : data;
+}
+async function timePhase(timings, name, fn) {
+	pluginEvents.emit("progress", {
+		phase: name,
+		status: "running"
+	});
+	const startedAt = Date.now();
+	try {
+		const result = await fn();
+		timings.push({
+			name,
+			durationMs: Date.now() - startedAt
+		});
+		pluginEvents.emit("progress", {
+			phase: name,
+			status: "done",
+			durationMs: Date.now() - startedAt
+		});
+		return result;
+	} catch (error) {
+		pluginEvents.emit("progress", {
+			phase: name,
+			status: "error",
+			durationMs: Date.now() - startedAt
+		});
+		throw error;
+	}
 }
 const buildCommands = {
 	host: {
@@ -435,6 +470,10 @@ var plugin_default = createPlugin({
 		}),
 		dev: builder.dev.handler(async ({ input }) => {
 			ensureEnvFile(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";
@@ -447,9 +486,41 @@ var plugin_default = createPlugin({
 				hostMode: hostSource,
 				bosConfig: deps.bosConfig ?? void 0,
 				extendsChain: []
-			})).catalogChanged) await run("bun", ["install"], { cwd: deps.configDir });
-			if (apiSource === "local" && !proxy || localPackages.some((pkg) => pkg.startsWith("plugin:"))) await buildEveryPluginQuietly(deps.configDir);
+			})).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"
+				});
+			}
+			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 refreshed = await loadConfig({ cwd: deps.configDir });
 			deps.bosConfig = refreshed?.config ?? deps.bosConfig;
 			deps.runtimeConfig = refreshed?.runtime ?? deps.runtimeConfig;
@@ -497,8 +568,11 @@ var plugin_default = createPlugin({
 				port: runtimeConfig.host.port,
 				interactive: input.interactive
 			};
-			const { devApp } = await loadDevSession();
-			devApp(orchestrator, services, runtimeConfig);
+			pendingSession = {
+				orchestrator,
+				services,
+				runtimeConfig
+			};
 			return {
 				status: "started",
 				description: orchestrator.description,
@@ -507,6 +581,10 @@ var plugin_default = createPlugin({
 		}),
 		start: builder.start.handler(async ({ input }) => {
 			ensureEnvFile(deps.configDir);
+			pluginEvents.emit("progress", {
+				phase: "config",
+				status: "running"
+			});
 			const account = input.account ?? process.env.BOS_ACCOUNT;
 			const domain = input.domain ?? process.env.BOS_GATEWAY;
 			let config = null;
@@ -541,10 +619,18 @@ var plugin_default = createPlugin({
 				env: "production",
 				plugins: runtimePlugins
 			});
+			pluginEvents.emit("progress", {
+				phase: "generate artifacts",
+				status: "running"
+			});
 			await generateCodeArtifacts(deps.configDir, config, {
 				env: "production",
 				runtimeConfig
 			});
+			pluginEvents.emit("progress", {
+				phase: "generate artifacts",
+				status: "done"
+			});
 			const productionEnv = {};
 			const warnings = [];
 			if (!process.env.CORS_ORIGIN && config.domain) {
@@ -564,32 +650,40 @@ var plugin_default = createPlugin({
 			if (missingSecrets.length > 0) warnings.push(`Missing ${missingSecrets.length} secret(s): ${missingSecrets.join(", ")}`);
 			const services = buildServiceDescriptorMap(runtimeConfig);
 			const stagingEnvVars = isStaging ? { BOS_GATEWAY: config.staging?.domain ?? config.domain ?? "" } : {};
-			const configSource = remoteConfig ? `bos://${account}/${domain}` : findConfigPath() ?? "bos.config.json";
-			const configSourceHttp = remoteConfig && account && domain ? buildRegistryConfigUrl(account, domain) : void 0;
-			const summaryLines = ["", `  ${colors.dim("Config Source:")}  ${configSource}`];
-			if (configSourceHttp) summaryLines.push(`                  ${colors.dim(configSourceHttp)}`);
-			summaryLines.push(`  ${colors.dim("Account:")}        ${config.account}`, `  ${colors.dim("Domain:")}         ${config.domain ?? "not configured"}`, "", `  ${colors.dim("Modules:")}`, `    ${colors.dim("HOST")}  → ${runtimeConfig.host.remoteUrl ?? runtimeConfig.host.url ?? "local"}`, `    ${colors.dim("UI")}   → ${runtimeConfig.ui.url ?? "local"}`, `    ${colors.dim("API")}  → ${runtimeConfig.api.url ?? "local"}`);
-			if (runtimeConfig.auth) summaryLines.push(`    ${colors.dim("AUTH")}  → ${runtimeConfig.auth.url ?? "local"}`);
-			if (warnings.length > 0) {
-				summaryLines.push("");
-				for (const w of warnings) summaryLines.push(`  ${colors.yellow(w)}`);
-			}
-			summaryLines.push("");
-			console.log(summaryLines.join("\n"));
-			const orchestrator = {
-				packages: ["host"],
-				env: {
-					NODE_ENV: "production",
-					...productionEnv,
-					...stagingEnvVars
+			const summary = {
+				configSource: remoteConfig ? `bos://${account}/${domain}` : findConfigPath() ?? "bos.config.json",
+				configSourceHttp: remoteConfig && account && domain ? buildRegistryConfigUrl(account, domain) : void 0,
+				account: config.account,
+				domain: config.domain ?? void 0,
+				modules: {
+					host: runtimeConfig.host.remoteUrl ?? runtimeConfig.host.url ?? "local",
+					ui: runtimeConfig.ui.url ?? "local",
+					api: runtimeConfig.api.url ?? "local",
+					auth: runtimeConfig.auth?.url ?? void 0
+				},
+				warnings
+			};
+			pendingSession = {
+				orchestrator: {
+					packages: ["host"],
+					env: {
+						NODE_ENV: "production",
+						...productionEnv,
+						...stagingEnvVars
+					},
+					description: `${isStaging ? "Staging" : "Production"} Mode (${config.account})`,
+					port,
+					interactive: input.interactive,
+					noLogs: true
 				},
-				description: `${isStaging ? "Staging" : "Production"} Mode (${config.account})`,
-				port,
-				interactive: input.interactive,
-				noLogs: true
+				services,
+				runtimeConfig
 			};
-			const { startApp } = await loadDevSession();
-			startApp(orchestrator, services, runtimeConfig);
+			pendingStartSummary = summary;
+			pluginEvents.emit("progress", {
+				phase: "config",
+				status: "done"
+			});
 			return {
 				status: "running",
 				url: `http://localhost:${port}`
@@ -779,8 +873,8 @@ var plugin_default = createPlugin({
 				let extendsAccount = "";
 				let extendsGateway = "";
 				let directory = input.directory;
-				let account = input.account;
-				let domain = input.domain;
+				const account = input.account;
+				const domain = input.domain;
 				let overrides = input.overrides;
 				let plugins = input.plugins;
 				if (input.extends) {
@@ -792,77 +886,22 @@ var plugin_default = createPlugin({
 				}
 				extendsAccount = extendsAccount || "dev.everything.near";
 				extendsGateway = extendsGateway || "everything.dev";
-				const s = p.spinner();
-				s.start("Initializing project");
 				let parentPluginKeys = [];
 				let parentConfig = null;
 				try {
-					parentConfig = await timePhase(timings, "parent config", () => fetchParentConfig(extendsAccount, extendsGateway), s);
+					parentConfig = await timePhase(timings, "parent config", () => fetchParentConfig(extendsAccount, extendsGateway));
 					if (parentConfig?.plugins && typeof parentConfig.plugins === "object") parentPluginKeys = Object.keys(parentConfig.plugins);
 				} catch {}
-				if (!input.noInteractive) {
-					s.stop("Config fetched");
-					const initialExtendsAccount = extendsAccount;
-					const initialExtendsGateway = extendsGateway;
-					const prompted = await promptInitOptions({
-						extends: `bos://${extendsAccount}/${extendsGateway}`,
-						directory,
-						account,
-						domain,
-						plugins,
-						overrides,
-						parentPluginKeys
-					});
-					extendsAccount = prompted.extendsAccount;
-					extendsGateway = prompted.extendsGateway;
-					directory = prompted.directory;
-					account = prompted.account;
-					domain = prompted.domain;
-					plugins = prompted.plugins;
-					overrides = prompted.overrides;
-					if (!parentConfig || prompted.extendsAccount !== initialExtendsAccount || prompted.extendsGateway !== initialExtendsGateway) {
-						try {
-							parentConfig = await timePhase(timings, "parent config", () => fetchParentConfig(prompted.extendsAccount, prompted.extendsGateway), s);
-							if (parentConfig?.plugins && typeof parentConfig.plugins === "object") parentPluginKeys = Object.keys(parentConfig.plugins);
-							else parentPluginKeys = [];
-						} catch {
-							return {
-								status: "error",
-								directory,
-								extendsRef: `bos://${prompted.extendsAccount}/${prompted.extendsGateway}`,
-								account,
-								domain,
-								extends: `bos://${prompted.extendsAccount}/${prompted.extendsGateway}`,
-								plugins,
-								overrides,
-								filesCopied: 0,
-								timings,
-								error: `No config found at bos://${prompted.extendsAccount}/${prompted.extendsGateway} — are you sure this is the right parent?`
-							};
-						}
-						s.stop("Config fetched");
-					}
-					if (typeof parentConfig?.title === "string" && parentConfig.title.trim() && typeof parentConfig.description === "string" && parentConfig.description.trim()) {
-						const shouldContinue = await p.confirm({
-							message: `You will be extending ${parentConfig.title} - ${parentConfig.description}. Continue?`,
-							initialValue: true
-						});
-						if (p.isCancel(shouldContinue) || !shouldContinue) process.exit(0);
-					}
-					s.start("Setting up project");
-				}
 				overrides = overrides?.length ? overrides : ["ui", "api"];
-				if (overrides.includes("plugins") && !plugins?.length) plugins = parentPluginKeys;
+				if (overrides.includes("plugins") && plugins === void 0) plugins = parentPluginKeys;
 				plugins = plugins ?? [];
 				directory = directory || domain || extendsGateway;
 				const targetDir = resolve(directory);
 				const extendsRef = `bos://${extendsAccount}/${extendsGateway}`;
-				if (overrides.includes("plugins") && !plugins.length) {}
 				const repository = await detectGitRemoteUrl(process.cwd()).catch(() => void 0) ?? parentConfig?.repository;
 				if (!parentConfig) try {
-					parentConfig = await timePhase(timings, "parent config", () => fetchParentConfig(extendsAccount, extendsGateway), s);
+					parentConfig = await timePhase(timings, "parent config", () => fetchParentConfig(extendsAccount, extendsGateway));
 				} catch {
-					s.stop("Failed");
 					return {
 						status: "error",
 						directory,
@@ -881,7 +920,7 @@ var plugin_default = createPlugin({
 					extendsAccount,
 					extendsGateway,
 					source: input.source
-				}), s);
+				}));
 				parentConfig = resolvedParentConfig;
 				const isMinimalScaffold = sourceDir === "";
 				try {
@@ -894,8 +933,10 @@ var plugin_default = createPlugin({
 							domain,
 							plugins,
 							overrides,
-							repository
-						}), s);
+							repository,
+							title: parentConfig?.title,
+							description: parentConfig?.description
+						}));
 						await timePhase(timings, "personalize config", () => personalizeConfig(targetDir, {
 							extendsAccount,
 							extendsGateway,
@@ -904,35 +945,18 @@ var plugin_default = createPlugin({
 							plugins,
 							overrides,
 							mode: "init",
-							repository
-						}), s);
+							repository,
+							title: parentConfig?.title,
+							description: parentConfig?.description,
+							testnet: parentConfig?.testnet,
+							staging: parentConfig?.staging
+						}));
 					} else {
-						const patterns = await readTemplatekeep(sourceDir);
-						if (patterns.length === 0) {
-							s.stop("Failed");
-							return {
-								status: "error",
-								directory,
-								extendsRef,
-								account,
-								domain,
-								extends: extendsRef,
-								plugins,
-								overrides,
-								filesCopied: 0,
-								error: "No .templatekeep found in template source"
-							};
-						}
-						const pluginRoutes = {};
-						if (overrides.includes("plugins")) {
-							const parentRuntimePlugins = await buildRuntimePluginsForConfig(parentConfig, sourceDir, "production");
-							for (const [key, plugin] of Object.entries(parentRuntimePlugins ?? {})) if (plugin.routes && plugin.routes.length > 0) pluginRoutes[key] = plugin.routes;
-						}
+						const patterns = buildInitPatterns(overrides, plugins);
 						filesCopied = await timePhase(timings, "copy files", () => copyFilteredFiles(sourceDir, targetDir, patterns, {
 							overrides,
-							plugins,
-							pluginRoutes
-						}), s);
+							plugins
+						}));
 						await timePhase(timings, "personalize config", () => personalizeConfig(targetDir, {
 							extendsAccount,
 							extendsGateway,
@@ -940,49 +964,34 @@ var plugin_default = createPlugin({
 							domain: domain || extendsGateway,
 							plugins,
 							overrides,
-							pluginRoutes,
 							workspaceOpts: { sourceDir },
-							repository
-						}), s);
+							repository,
+							title: parentConfig?.title,
+							description: parentConfig?.description,
+							testnet: parentConfig?.testnet,
+							staging: parentConfig?.staging
+						}));
 						await timePhase(timings, "write snapshot", () => writeInitSnapshot(targetDir, extendsAccount, extendsGateway, sourceDir, patterns, {
 							overrides,
-							plugins,
-							pluginRoutes
-						}), s);
+							plugins
+						}));
 					}
 					const lockfilePath = join(targetDir, "bun.lock");
 					stripOrphanedWorkspacesFromLockfile(lockfilePath, computeAllowedWorkspaces(overrides, plugins));
 					removeInitLockfile(lockfilePath);
-					const initConfig = await timePhase(timings, "resolve config", () => loadConfig({ cwd: targetDir }), s);
+					const initConfig = await timePhase(timings, "resolve config", () => loadConfig({ cwd: targetDir }));
 					if (initConfig?.runtime) await timePhase(timings, "generate env/docker", async () => {
 						writeGeneratedInfra(targetDir, initConfig.runtime);
-					}, s);
+					});
 					await timePhase(timings, "create env file", async () => {
 						ensureEnvFile(targetDir);
-					}, s);
+					});
 					if (!input.noInstall) {
-						await timePhase(timings, "install dependencies", () => runBunInstall(targetDir, s ?? void 0));
-						await timePhase(timings, "generate types", () => runTypesGen(targetDir, s ?? void 0));
-						await timePhase(timings, "generate migrations", () => generateDatabaseMigrations(targetDir), s);
-					}
-					if (input.noInstall && initConfig?.config) await timePhase(timings, "generate code artifacts", () => generateCodeArtifacts(targetDir, initConfig.config), s);
-					s.stop("Project initialized");
-					if (!input.noInteractive) {
-						if (await p.confirm({
-							message: "Run docker compose up -d --wait?",
-							initialValue: true
-						}) === true) {
-							const dockerSpinner = p.spinner();
-							dockerSpinner.start("Starting Docker services");
-							try {
-								await timePhase(timings, "docker compose up", () => runDockerComposeUp(targetDir));
-								dockerSpinner.stop("Docker services ready");
-							} catch (error) {
-								dockerSpinner.stop("Docker services not started");
-								p.log.warn(`docker compose up -d --wait failed: ${error instanceof Error ? error.message : error}`);
-							}
-						}
+						await timePhase(timings, "install dependencies", () => runBunInstall(targetDir));
+						await timePhase(timings, "generate types", () => runTypesGen(targetDir));
+						await timePhase(timings, "generate migrations", () => generateDatabaseMigrations(targetDir));
 					}
+					if (input.noInstall && initConfig?.config) await timePhase(timings, "generate code artifacts", () => generateCodeArtifacts(targetDir, initConfig.config));
 					return {
 						status: "initialized",
 						directory,
@@ -993,7 +1002,8 @@ var plugin_default = createPlugin({
 						plugins,
 						overrides,
 						filesCopied,
-						timings
+						timings,
+						targetDir
 					};
 				} finally {
 					await cleanup();
@@ -1168,10 +1178,10 @@ function computeAllowedWorkspaces(overrides, plugins) {
 		if (section === "ui") workspaces.push("ui");
 		if (section === "api") workspaces.push("api");
 	}
-	if (plugins) for (const plugin of plugins) workspaces.push(`plugins/${plugin}`);
+	if (plugins && plugins.length > 0) workspaces.push("plugins/*");
 	return workspaces;
 }
 
 //#endregion
-export { plugin_default as default };
+export { consumeDevSession, plugin_default as default, pluginEvents };
 //# sourceMappingURL=plugin.mjs.map