everything-dev 1.12.3 → 1.13.1

package/dist/merge.mjs

@@ -0,0 +1,107 @@
+import { createDefu } from "defu";
+
+//#region src/merge.ts
+const BOS_CONFIG_ORDER = [
+	"extends",
+	"account",
+	"domain",
+	"testnet",
+	"staging",
+	"repository",
+	"app",
+	"plugins",
+	"shared"
+];
+const ARRAY_UNION_KEYS = new Set(["secrets"]);
+function isPlainObject(value) {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function unionArrays(a, b) {
+	const aArr = Array.isArray(a) ? a : [];
+	const bArr = Array.isArray(b) ? b : [];
+	if (aArr.length === 0 && bArr.length === 0) return void 0;
+	const seen = /* @__PURE__ */ new Set();
+	const result = [];
+	for (const item of [...aArr, ...bArr]) {
+		if (typeof item === "string") {
+			if (seen.has(item)) continue;
+			seen.add(item);
+		}
+		result.push(item);
+	}
+	return result;
+}
+function cleanNullSentinels(obj) {
+	const out = {};
+	for (const [key, value] of Object.entries(obj)) {
+		if (value === null || value === void 0) continue;
+		if (isPlainObject(value)) {
+			const cleaned = cleanNullSentinels(value);
+			if (Object.keys(cleaned).length > 0) out[key] = cleaned;
+		} else out[key] = value;
+	}
+	return out;
+}
+const bosConfigMerger = createDefu((obj, key, value) => {
+	if (obj[key] === null) return true;
+	if (value === null) {
+		obj[key] = null;
+		return true;
+	}
+	if (Array.isArray(obj[key]) && Array.isArray(value)) {
+		if (ARRAY_UNION_KEYS.has(key)) obj[key] = unionArrays(obj[key], value);
+		else obj[key] = value;
+		return true;
+	}
+	return false;
+});
+function resolveExtendsRef(extendsField, env) {
+	if (!extendsField) return void 0;
+	if (typeof extendsField === "string") return extendsField;
+	return extendsField[env] ?? extendsField.production ?? Object.values(extendsField).find(Boolean);
+}
+function mergeBosConfigWithExtends(parent, child) {
+	const merged = bosConfigMerger(child, parent);
+	if (isPlainObject(parent.plugins) && isPlainObject(child.plugins)) {
+		const plugins = { ...parent.plugins };
+		for (const [key, rawValue] of Object.entries(child.plugins)) {
+			const value = rawValue;
+			if (value === null || value === false) delete plugins[key];
+			else if (isPlainObject(plugins[key]) && isPlainObject(value)) plugins[key] = bosConfigMerger(value, plugins[key]);
+			else plugins[key] = value;
+		}
+		merged.plugins = plugins;
+	} else if (child.plugins !== void 0) merged.plugins = cleanNullSentinels(child.plugins);
+	const mergedRecord = merged;
+	if (isPlainObject(mergedRecord.app)) for (const entryVal of Object.values(mergedRecord.app)) {
+		if (!isPlainObject(entryVal)) continue;
+		for (const secretKey of ARRAY_UNION_KEYS) if (Array.isArray(entryVal[secretKey])) entryVal[secretKey] = unionArrays(entryVal[secretKey], [])?.filter(Boolean) ?? entryVal[secretKey];
+	}
+	if (isPlainObject(mergedRecord.plugins)) for (const pluginVal of Object.values(mergedRecord.plugins)) {
+		if (!isPlainObject(pluginVal)) continue;
+		for (const secretKey of ARRAY_UNION_KEYS) if (Array.isArray(pluginVal[secretKey])) pluginVal[secretKey] = unionArrays(pluginVal[secretKey], [])?.filter(Boolean) ?? pluginVal[secretKey];
+	}
+	return rebuildOrderedConfig(mergedRecord);
+}
+function mergeBosConfigWithTemplate(local, template) {
+	return rebuildOrderedConfig(mergeJsonValuesPreservingLocalOrder(local, template));
+}
+function mergeJsonValuesPreservingLocalOrder(local, template) {
+	if (isPlainObject(local) && isPlainObject(template)) {
+		const merged = {};
+		for (const key of Object.keys(local)) merged[key] = mergeJsonValuesPreservingLocalOrder(local[key], template[key]);
+		for (const key of Object.keys(template)) if (!(key in merged)) merged[key] = template[key];
+		return merged;
+	}
+	return local ?? template;
+}
+function rebuildOrderedConfig(config) {
+	const ordered = {};
+	for (const key of BOS_CONFIG_ORDER) if (key in config) ordered[key] = config[key];
+	for (const key of Object.keys(config)) if (!BOS_CONFIG_ORDER.includes(key)) ordered[key] = config[key];
+	return ordered;
+}
+
+//#endregion
+export { BOS_CONFIG_ORDER, isPlainObject, mergeBosConfigWithExtends, mergeBosConfigWithTemplate, rebuildOrderedConfig, resolveExtendsRef };
+//# sourceMappingURL=merge.mjs.map

package/dist/merge.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.mjs","names":[],"sources":["../src/merge.ts"],"sourcesContent":["import { createDefu } from \"defu\";\nimport type { BosConfigInput, ExtendsConfig } from \"./types\";\n\nexport const BOS_CONFIG_ORDER = [\n  \"extends\",\n  \"account\",\n  \"domain\",\n  \"testnet\",\n  \"staging\",\n  \"repository\",\n  \"app\",\n  \"plugins\",\n  \"shared\",\n] as const;\n\nexport type BosConfigFieldName = (typeof BOS_CONFIG_ORDER)[number];\n\nexport type BosEnv = \"development\" | \"production\" | \"staging\";\n\nexport interface ResolvedConfigMeta {\n  env: BosEnv;\n  resolvedAt: string;\n  extendsChain: string[];\n  source?: string;\n}\n\nconst ARRAY_UNION_KEYS = new Set([\"secrets\"]);\n\nexport function isPlainObject(value: unknown): value is Record<string, unknown> {\n  return Boolean(value) && typeof value === \"object\" && !Array.isArray(value);\n}\n\nfunction unionArrays(a: unknown, b: unknown): unknown[] | undefined {\n  const aArr = Array.isArray(a) ? a : [];\n  const bArr = Array.isArray(b) ? b : [];\n  if (aArr.length === 0 && bArr.length === 0) return undefined;\n  const seen = new Set<string>();\n  const result: unknown[] = [];\n  for (const item of [...aArr, ...bArr]) {\n    if (typeof item === \"string\") {\n      if (seen.has(item)) continue;\n      seen.add(item);\n    }\n    result.push(item);\n  }\n  return result;\n}\n\nfunction cleanNullSentinels(obj: Record<string, unknown>): Record<string, unknown> {\n  const out: Record<string, unknown> = {};\n  for (const [key, value] of Object.entries(obj)) {\n    if (value === null || value === undefined) continue;\n    if (isPlainObject(value)) {\n      const cleaned = cleanNullSentinels(value);\n      if (Object.keys(cleaned).length > 0) {\n        out[key] = cleaned;\n      }\n    } else {\n      out[key] = value;\n    }\n  }\n  return out;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst bosConfigMerger = createDefu((obj: any, key: any, value: any): boolean | undefined => {\n  if (obj[key] === null) return true;\n  if (value === null) {\n    obj[key] = null;\n    return true;\n  }\n  if (Array.isArray(obj[key]) && Array.isArray(value)) {\n    if (ARRAY_UNION_KEYS.has(key)) {\n      obj[key] = unionArrays(obj[key], value);\n    } else {\n      obj[key] = value;\n    }\n    return true;\n  }\n  return false;\n});\n\nexport function resolveExtendsRef(\n  extendsField: string | ExtendsConfig | undefined,\n  env: BosEnv,\n): string | undefined {\n  if (!extendsField) return undefined;\n  if (typeof extendsField === \"string\") return extendsField;\n  return extendsField[env] ?? extendsField.production ?? Object.values(extendsField).find(Boolean);\n}\n\nexport function mergeBosConfigWithExtends(\n  parent: BosConfigInput,\n  child: BosConfigInput,\n): BosConfigInput {\n  const merged = bosConfigMerger(child, parent) as BosConfigInput;\n\n  if (isPlainObject(parent.plugins) && isPlainObject(child.plugins)) {\n    const plugins: Record<string, unknown> = { ...parent.plugins };\n    for (const [key, rawValue] of Object.entries(child.plugins)) {\n      const value = rawValue as unknown;\n      if (value === null || value === false) {\n        delete plugins[key];\n      } else if (isPlainObject(plugins[key]) && isPlainObject(value)) {\n        plugins[key] = bosConfigMerger(\n          value as Record<string, unknown>,\n          plugins[key] as Record<string, unknown>,\n        );\n      } else {\n        plugins[key] = value;\n      }\n    }\n    (merged as Record<string, unknown>).plugins = plugins;\n  } else if (child.plugins !== undefined) {\n    (merged as Record<string, unknown>).plugins = cleanNullSentinels(\n      child.plugins as Record<string, unknown>,\n    );\n  }\n\n  const mergedRecord = merged as Record<string, unknown>;\n\n  if (isPlainObject(mergedRecord.app)) {\n    for (const entryVal of Object.values(mergedRecord.app as Record<string, unknown>)) {\n      if (!isPlainObject(entryVal)) continue;\n      for (const secretKey of ARRAY_UNION_KEYS) {\n        if (Array.isArray(entryVal[secretKey])) {\n          entryVal[secretKey] =\n            (unionArrays(entryVal[secretKey] as unknown[], []) as string[] | undefined)?.filter(\n              Boolean,\n            ) ?? entryVal[secretKey];\n        }\n      }\n    }\n  }\n\n  if (isPlainObject(mergedRecord.plugins)) {\n    for (const pluginVal of Object.values(mergedRecord.plugins as Record<string, unknown>)) {\n      if (!isPlainObject(pluginVal)) continue;\n      for (const secretKey of ARRAY_UNION_KEYS) {\n        if (Array.isArray(pluginVal[secretKey])) {\n          pluginVal[secretKey] =\n            (unionArrays(pluginVal[secretKey] as unknown[], []) as string[] | undefined)?.filter(\n              Boolean,\n            ) ?? pluginVal[secretKey];\n        }\n      }\n    }\n  }\n\n  return rebuildOrderedConfig(mergedRecord) as BosConfigInput;\n}\n\nexport function mergeBosConfigWithTemplate(\n  local: BosConfigInput,\n  template: BosConfigInput,\n): BosConfigInput {\n  const merged = mergeJsonValuesPreservingLocalOrder(local, template) as BosConfigInput;\n  return rebuildOrderedConfig(merged as Record<string, unknown>) as BosConfigInput;\n}\n\nfunction mergeJsonValuesPreservingLocalOrder(local: unknown, template: unknown): unknown {\n  if (isPlainObject(local) && isPlainObject(template)) {\n    const merged: Record<string, unknown> = {};\n    for (const key of Object.keys(local)) {\n      merged[key] = mergeJsonValuesPreservingLocalOrder(\n        local[key],\n        (template as Record<string, unknown>)[key],\n      );\n    }\n    for (const key of Object.keys(template as Record<string, unknown>)) {\n      if (!(key in merged)) {\n        merged[key] = (template as Record<string, unknown>)[key];\n      }\n    }\n    return merged;\n  }\n  return local ?? template;\n}\n\nexport function rebuildOrderedConfig<T extends Record<string, unknown>>(config: T): T {\n  const ordered: Record<string, unknown> = {};\n\n  for (const key of BOS_CONFIG_ORDER) {\n    if (key in config) {\n      ordered[key] = config[key];\n    }\n  }\n\n  for (const key of Object.keys(config)) {\n    if (!BOS_CONFIG_ORDER.includes(key as BosConfigFieldName)) {\n      ordered[key] = config[key];\n    }\n  }\n\n  return ordered as T;\n}\n\nexport { bosConfigMerger };\n"],"mappings":"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"}

package/dist/plugin.cjs

@@ -6,6 +6,7 @@ const require_config = require('./config.cjs');
 const require_contract = require('./contract.cjs');
 const require_api_contract = require('./api-contract.cjs');
 const require_app = require('./app.cjs');
+const require_save_config = require('./utils/save-config.cjs');
 const require_cli_init = require('./cli/init.cjs');
 const require_prompts = require('./cli/prompts.cjs');
 const require_status = require('./cli/status.cjs');
@@ -17,6 +18,7 @@ const require_service_descriptor = require('./service-descriptor.cjs');
 const require_dev_session = require('./dev-session.cjs');
 const require_near_cli = require('./near-cli.cjs');
 const require_shared = require('./shared.cjs');
+const require_sidebar = require('./sidebar.cjs');
 const require_run = require('./utils/run.cjs');
 let node_fs = require("node:fs");
 let node_path = require("node:path");
@@ -58,6 +60,10 @@ const buildCommands = {
 	}
 };
 const PUBLISH_FUNCTION_NAMES = ["__fastdata_kv"];
+function getPluginRef(entry) {
+	if (!entry || typeof entry === "string") return null;
+	return entry;
+}
 function parseSourceMode(value, defaultValue) {
 	if (value === "local" || value === "remote") return value;
 	return defaultValue;
@@ -85,7 +91,7 @@ function resolveWorkspaceTarget(key, bosConfig, runtimeConfig, configDir) {
 			path: `${configDir}/${key}`
 		};
 	}
-	const pluginPath = (runtimeConfig?.plugins?.[key])?.localPath ?? require_config.resolveLocalDevelopmentPath(bosConfig?.plugins?.[key]?.development, configDir);
+	const pluginPath = (runtimeConfig?.plugins?.[key])?.localPath ?? require_config.resolveLocalDevelopmentPath(getPluginRef(bosConfig?.plugins?.[key])?.development, configDir);
 	if (pluginPath) return {
 		key,
 		kind: "plugin",
@@ -123,29 +129,25 @@ function defaultPluginKey(source) {
 	}
 }
 function pluginLocalPath(configDir, attachment) {
-	const source = attachment.development ?? attachment.production;
+	const ref = getPluginRef(attachment);
+	const source = ref?.development ?? ref?.production;
 	if (!source?.startsWith("local:")) return null;
 	return (0, node_path.join)(configDir, source.slice(6));
 }
-async function saveBosConfig(configDir, config) {
-	const filePath = (0, node_path.join)(configDir, "bos.config.json");
-	const next = `${JSON.stringify(config, null, 2)}\n`;
-	try {
-		if ((0, node_fs.readFileSync)(filePath, "utf8") === next) return;
-	} catch {}
-	(0, node_fs.writeFileSync)(filePath, next);
-}
 function listPluginAttachments(config) {
-	return Object.entries(config?.plugins ?? {}).map(([key, attachment]) => ({
-		key,
-		development: attachment.development,
-		production: attachment.production,
-		localPath: attachment.development?.startsWith("local:") ? attachment.development.slice(6) : void 0,
-		source: attachment.development?.startsWith("local:") ? "local" : "remote",
-		integrity: attachment.integrity,
-		version: attachment.version,
-		name: attachment.name
-	})).sort((a, b) => a.key.localeCompare(b.key));
+	return Object.entries(config?.plugins ?? {}).map(([key, attachment]) => {
+		const ref = getPluginRef(attachment);
+		return {
+			key,
+			development: ref?.development,
+			production: ref?.production,
+			localPath: ref?.development?.startsWith("local:") ? ref.development.slice(6) : void 0,
+			source: ref?.development?.startsWith("local:") ? "local" : "remote",
+			integrity: ref?.integrity,
+			version: ref?.version,
+			name: ref?.name
+		};
+	}).sort((a, b) => a.key.localeCompare(b.key));
 }
 async function refreshApiContractBridge(configDir, env = "development") {
 	const refreshed = await require_config.loadConfig({
@@ -158,6 +160,7 @@ async function refreshApiContractBridge(configDir, env = "development") {
 		runtimeConfig: refreshed.runtime,
 		apiBaseUrl: refreshed.runtime.api.url
 	});
+	require_sidebar.writePluginSidebarGen(configDir, refreshed.config);
 }
 function extractPublishedUrl(output) {
 	const match = output.match(/https?:\/\/[^\s"'<>]+/g);
@@ -239,7 +242,8 @@ async function buildWorkspaceTargets(opts) {
 	if ((await require_shared.syncAndGenerateSharedUi({
 		configDir: opts.configDir,
 		hostMode: "local",
-		bosConfig: opts.bosConfig ?? void 0
+		bosConfig: opts.bosConfig ?? void 0,
+		extendsChain: []
 	})).catalogChanged) await require_run.run("bun", ["install"], { cwd: opts.configDir });
 	if (existing.some((entry) => entry.key === "api")) await buildEveryPluginQuietly(opts.configDir);
 	await buildEverythingDevQuietly(opts.configDir);
@@ -296,76 +300,40 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				key: "",
 				error: "No bos.config.json found"
 			};
-			const pluginRef = require_fastkv.parsePluginBosUrl(input.source);
-			let production = input.production ?? input.source;
-			let integrity;
-			let version;
-			let name;
-			if (pluginRef) try {
-				const entry = await require_fastkv.fetchPluginFromRegistry(pluginRef.accountId, pluginRef.pluginName);
-				if (!entry) return {
-					status: "error",
-					key: "",
-					error: `Plugin not found in registry: bos://${pluginRef.accountId}/plugins/${pluginRef.pluginName}`
-				};
-				const manifest = entry.manifest;
-				if (manifest.schemaVersion !== 1 || manifest.kind !== "every-plugin/manifest" || !manifest.plugin?.name || !manifest.plugin?.version || !manifest.runtime?.remoteEntry) return {
-					status: "error",
-					key: "",
-					error: `Invalid plugin manifest for bos://${pluginRef.accountId}/plugins/${pluginRef.pluginName}`
-				};
-				production = entry.metadata.cdnUrl || input.production || input.source;
-				name = manifest.plugin.name;
-				version = manifest.plugin.version;
-			} catch (error) {
-				return {
-					status: "error",
-					key: "",
-					error: `Failed to resolve plugin from registry: ${error instanceof Error ? error.message : error}`
-				};
-			}
-			if (!input.source.startsWith("local:") && !pluginRef && production.startsWith("https://")) try {
-				const manifest = await require_fastkv.fetchRemotePluginManifest(production);
-				if (manifest) {
-					name = manifest.plugin.name;
-					version = manifest.plugin.version;
-				}
-			} catch {
-				console.warn(`[plugin add] Could not fetch manifest from ${production}`);
-			}
-			if (!input.source.startsWith("local:") && production.startsWith("https://")) try {
-				const computed = await require_integrity.computeSriHashForUrl(production);
-				if (computed) integrity = computed;
-			} catch {
-				console.warn(`[plugin add] Could not compute integrity for ${production}`);
-			}
-			const key = sanitizePluginKey(input.as ?? (pluginRef ? pluginRef.pluginName : defaultPluginKey(input.source)));
+			const isBosRef = input.source.startsWith("bos://");
+			const isLocal = input.source.startsWith("local:");
+			const key = sanitizePluginKey(input.as ?? (isBosRef ? input.source.split("/").pop() ?? "plugin" : defaultPluginKey(input.source)));
 			const existing = deps.bosConfig.plugins?.[key];
+			const existingEntry = existing && typeof existing === "object" ? existing : {};
 			const nextPlugins = { ...deps.bosConfig.plugins ?? {} };
-			nextPlugins[key] = input.source.startsWith("local:") ? {
-				...existing ?? {},
+			if (isBosRef) nextPlugins[key] = {
+				...existingEntry,
+				extends: input.source
+			};
+			else if (isLocal) nextPlugins[key] = {
+				...existingEntry,
 				development: input.source,
-				production: input.production ?? existing?.production
-			} : {
-				...existing ?? {},
-				production,
-				...integrity ? { integrity } : {},
-				...name ? { name } : {},
-				...version ? { version } : {}
+				...existingEntry.extends ? {} : {}
+			};
+			else nextPlugins[key] = {
+				...existingEntry,
+				production: input.production ?? input.source
 			};
 			deps.bosConfig = {
 				...deps.bosConfig,
 				plugins: nextPlugins
 			};
-			await saveBosConfig(deps.configDir, deps.bosConfig);
+			await require_save_config.saveBosConfig(deps.configDir, deps.bosConfig);
 			await refreshApiContractBridge(deps.configDir);
+			const stored = deps.bosConfig.plugins?.[key];
+			const storedObj = stored && typeof stored === "object" ? stored : {};
 			return {
 				status: "added",
 				key,
-				development: deps.bosConfig.plugins?.[key]?.development,
-				production: deps.bosConfig.plugins?.[key]?.production,
-				integrity,
-				version
+				development: storedObj.development,
+				production: storedObj.production,
+				integrity: storedObj.integrity,
+				version: storedObj.version
 			};
 		}),
 		pluginRemove: builder.pluginRemove.handler(async ({ input }) => {
@@ -385,7 +353,7 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				...deps.bosConfig,
 				plugins: Object.keys(nextPlugins).length > 0 ? nextPlugins : void 0
 			};
-			await saveBosConfig(deps.configDir, deps.bosConfig);
+			await require_save_config.saveBosConfig(deps.configDir, deps.bosConfig);
 			await refreshApiContractBridge(deps.configDir);
 			return {
 				status: "removed",
@@ -410,6 +378,7 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				key: input.key,
 				error: `Plugin '${input.key}' is not configured`
 			};
+			const attachmentRef = getPluginRef(attachment);
 			const localPath = pluginLocalPath(deps.configDir, attachment);
 			if (!localPath) return {
 				status: "error",
@@ -442,29 +411,36 @@ var plugin_default = (0, every_plugin.createPlugin)({
 			let publishedUrl = extractPublishedUrl(`${stdout}\n${stderr}`);
 			let manifest = null;
 			if (publishedUrl) manifest = await require_fastkv.fetchRemotePluginManifest(publishedUrl);
-			else if (attachment.production) {
-				manifest = await require_fastkv.fetchRemotePluginManifest(attachment.production);
-				if (manifest) publishedUrl = attachment.production;
+			else if (attachmentRef?.production) {
+				manifest = await require_fastkv.fetchRemotePluginManifest(attachmentRef.production);
+				if (manifest) publishedUrl = attachmentRef.production;
 			}
 			const integrity = publishedUrl ? await require_integrity.computeSriHashForUrl(publishedUrl) : null;
 			const version = manifest?.plugin.version ?? pkgJson.version;
 			if (publishedUrl) {
-				deps.bosConfig = {
-					...deps.bosConfig,
-					plugins: {
-						...deps.bosConfig.plugins ?? {},
-						[input.key]: {
-							...deps.bosConfig.plugins?.[input.key] ?? {},
-							production: publishedUrl,
-							...integrity ? { integrity } : {},
-							...manifest?.plugin.name ? { name: manifest.plugin.name } : {},
-							...version ? { version } : {}
-						}
-					}
-				};
-				await saveBosConfig(deps.configDir, deps.bosConfig);
+				const pluginConfigPath = (0, node_path.join)(localPath, "bos.config.json");
+				if ((0, node_fs.existsSync)(pluginConfigPath)) try {
+					const pluginConfig = JSON.parse((0, node_fs.readFileSync)(pluginConfigPath, "utf-8"));
+					if (!pluginConfig.app) pluginConfig.app = {};
+					const app = pluginConfig.app;
+					if (!app.api) app.api = {};
+					const api = app.api;
+					api.production = publishedUrl;
+					if (integrity) api.integrity = integrity;
+					else delete api.integrity;
+					(0, node_fs.writeFileSync)(pluginConfigPath, `${JSON.stringify(pluginConfig, null, 2)}\n`);
+					console.log(`   ✅ Updated ${pluginConfigPath}: app.api.production`);
+				} catch (err) {
+					console.error(`   ❌ Failed to update plugin bos.config.json:`, err instanceof Error ? err.message : err);
+				}
 				const account = deps.bosConfig.account;
 				const network = require_network.getNetworkIdForAccount(account);
+				let pluginDomain;
+				if ((0, node_fs.existsSync)(pluginConfigPath)) try {
+					const pluginConfig = JSON.parse((0, node_fs.readFileSync)(pluginConfigPath, "utf-8"));
+					if (typeof pluginConfig.domain === "string") pluginDomain = pluginConfig.domain;
+				} catch {}
+				if (!pluginDomain) pluginDomain = `${input.key}.${deps.bosConfig.domain ?? "everything.dev"}`;
 				if (manifest && version) try {
 					const registryEntries = {
 						[`plugins/${account}/${input.key}/manifest.json`]: JSON.stringify(manifest),
@@ -479,6 +455,11 @@ var plugin_default = (0, every_plugin.createPlugin)({
 						}),
 						[`plugins/${account}/${input.key}/versions/${version}/manifest.json`]: JSON.stringify(manifest)
 					};
+					if ((0, node_fs.existsSync)(pluginConfigPath)) try {
+						const publishedPluginConfig = JSON.parse((0, node_fs.readFileSync)(pluginConfigPath, "utf-8"));
+						delete publishedPluginConfig.development;
+						registryEntries[`apps/${account}/${pluginDomain}/bos.config.json`] = JSON.stringify(publishedPluginConfig);
+					} catch {}
 					const payload = JSON.stringify(registryEntries);
 					const argsBase64 = Buffer.from(payload).toString("base64");
 					const privateKey = process.env.NEAR_PRIVATE_KEY || process.env.BOS_NEAR_PRIVATE_KEY;
@@ -507,7 +488,7 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				key: input.key,
 				path: localPath,
 				script,
-				production: publishedUrl ?? attachment.production,
+				production: publishedUrl ?? attachmentRef?.production,
 				integrity: integrity ?? void 0,
 				version: version ?? void 0
 			};
@@ -524,13 +505,18 @@ var plugin_default = (0, every_plugin.createPlugin)({
 			if ((await require_shared.syncAndGenerateSharedUi({
 				configDir: deps.configDir,
 				hostMode: hostSource,
-				bosConfig: deps.bosConfig ?? void 0
+				bosConfig: deps.bosConfig ?? void 0,
+				extendsChain: []
 			})).catalogChanged) await require_run.run("bun", ["install"], { cwd: deps.configDir });
 			if (apiSource === "local" && !proxy || localPackages.some((pkg) => pkg.startsWith("plugin:"))) await buildEveryPluginQuietly(deps.configDir);
 			await buildEverythingDevQuietly(deps.configDir);
 			const refreshed = await require_config.loadConfig({ cwd: deps.configDir });
 			deps.bosConfig = refreshed?.config ?? deps.bosConfig;
 			deps.runtimeConfig = refreshed?.runtime ?? deps.runtimeConfig;
+			if (deps.bosConfig) {
+				require_config.writeResolvedConfig(deps.configDir, deps.bosConfig, "development", refreshed?.source.extended);
+				require_sidebar.writePluginSidebarGen(deps.configDir, deps.bosConfig);
+			}
 			if (!deps.bosConfig) return {
 				status: "error",
 				description: "No bos.config.json found",
@@ -618,6 +604,7 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				env: "production",
 				plugins: runtimePlugins
 			});
+			require_sidebar.writePluginSidebarGen(deps.configDir, config);
 			const productionEnv = {};
 			const warnings = [];
 			if (!process.env.CORS_ORIGIN && config.domain) {
@@ -677,6 +664,9 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				built: [],
 				skipped: []
 			};
+			const buildEnv = input.deploy ? "production" : "development";
+			require_config.writeResolvedConfig(deps.configDir, deps.bosConfig, buildEnv);
+			require_sidebar.writePluginSidebarGen(deps.configDir, deps.bosConfig);
 			const targets = selectWorkspaceTargets(input.packages, deps.bosConfig);
 			if (targets.length === 0) return {
 				status: "error",
@@ -688,7 +678,7 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				apiSource: deps.bosConfig.app.api?.development ? "local" : "remote",
 				authSource: deps.bosConfig.app.auth?.development ? "local" : "remote",
 				hostSource: deps.bosConfig.app.host?.development ? "local" : "remote",
-				env: "development",
+				env: buildEnv,
 				plugins: deps.runtimeConfig?.plugins
 			});
 			await require_api_contract.syncApiContractBridge({
@@ -758,7 +748,20 @@ var plugin_default = (0, every_plugin.createPlugin)({
 					publishConfig = refreshed.config;
 				}
 			}
-			const payload = JSON.stringify({ [`apps/${account}/${gateway}/bos.config.json`]: JSON.stringify(publishConfig) });
+			const registryEntries = { [`apps/${account}/${gateway}/bos.config.json`]: JSON.stringify(publishConfig) };
+			for (const [pluginKey, pluginEntry] of Object.entries(publishConfig.plugins ?? {})) {
+				const pluginRef = getPluginRef(pluginEntry);
+				if (!pluginRef?.development?.startsWith("local:")) continue;
+				const pluginConfigPath = (0, node_path.join)((0, node_path.join)(deps.configDir, pluginRef.development.slice(6)), "bos.config.json");
+				if (!(0, node_fs.existsSync)(pluginConfigPath)) continue;
+				try {
+					const pluginConfig = JSON.parse((0, node_fs.readFileSync)(pluginConfigPath, "utf-8"));
+					const pluginDomain = typeof pluginConfig.domain === "string" ? pluginConfig.domain : `${pluginKey}.${gateway}`;
+					delete pluginConfig.development;
+					registryEntries[`apps/${account}/${pluginDomain}/bos.config.json`] = JSON.stringify(pluginConfig);
+				} catch {}
+			}
+			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;
 			try {
@@ -882,7 +885,7 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				extendsAccount = extendsAccount || "dev.everything.near";
 				extendsGateway = extendsGateway || "everything.dev";
 				directory = directory || domain || extendsGateway;
-				plugins = plugins?.length ? plugins : ["_template"];
+				plugins = plugins?.length ? plugins : ["settings"];
 				try {
 					await require_cli_init.fetchParentConfig(extendsAccount, extendsGateway);
 				} catch {
@@ -919,8 +922,9 @@ var plugin_default = (0, every_plugin.createPlugin)({
 						error: "No .templatekeep found in template source"
 					};
 					const pluginRoutes = {};
-					if (parentConfig.plugins) {
-						for (const [key, ref] of Object.entries(parentConfig.plugins)) if (ref.routes && ref.routes.length > 0) pluginRoutes[key] = ref.routes;
+					if (parentConfig.plugins) for (const [key, entry] of Object.entries(parentConfig.plugins)) {
+						const entryRef = getPluginRef(entry);
+						if (entryRef?.routes && entryRef.routes.length > 0) pluginRoutes[key] = entryRef.routes;
 					}
 					const s = _clack_prompts.spinner();
 					s.start("Setting up project");
@@ -950,6 +954,8 @@ var plugin_default = (0, every_plugin.createPlugin)({
 						await require_cli_init.runTypesGen(directory);
 						await require_cli_init.generateDatabaseMigrations(directory);
 					}
+					const initConfig = await require_config.loadConfig({ cwd: directory });
+					if (initConfig?.config) require_sidebar.writePluginSidebarGen(directory, initConfig.config);
 					s.stop("Project initialized");
 					return {
 						status: "initialized",
@@ -990,7 +996,13 @@ var plugin_default = (0, every_plugin.createPlugin)({
 					added: [],
 					error: "No bos.config.json found in current directory"
 				};
-				return await require_sync.syncTemplate((0, node_path.resolve)((0, node_path.dirname)(configPath)), input);
+				const projectDir = (0, node_path.resolve)((0, node_path.dirname)(configPath));
+				const result = await require_sync.syncTemplate(projectDir, input);
+				if (result.status === "synced" || result.status === "dry-run") {
+					const syncedConfig = await require_config.loadConfig({ cwd: projectDir });
+					if (syncedConfig?.config) require_sidebar.writePluginSidebarGen(projectDir, syncedConfig.config);
+				}
+				return result;
 			} catch (error) {
 				return {
 					status: "error",