everything-dev 1.16.3 → 1.19.0

package/src/plugin.ts

@@ -15,6 +15,7 @@ import {
   runBunInstall,
   runDockerComposeUp,
   runTypesGen,
+  scaffoldMinimalProject,
   writeInitSnapshot,
 } from "./cli/init";
 import { promptInitOptions } from "./cli/prompts";
@@ -58,7 +59,7 @@ import {
 } from "./service-descriptor";
 import { syncAndGenerateSharedUi } from "./shared";
 import { writePluginSidebarGen } from "./sidebar";
-import type { BosConfig, BosPluginRef, RuntimeConfig, SourceMode } from "./types";
+import type { BosConfig, BosConfigInput, BosPluginRef, RuntimeConfig, SourceMode } from "./types";
 import { run } from "./utils/run";
 import { saveBosConfig } from "./utils/save-config";
 import { colors } from "./utils/theme";
@@ -236,8 +237,6 @@ async function generateCodeArtifacts(
     runtimeConfig?: RuntimeConfig;
   },
 ): Promise<GeneratedArtifacts | null> {
-  writePluginSidebarGen(configDir, config);
-
   if (opts?.env) {
     writeResolvedConfig(configDir, config, opts.env, opts.extendsChain);
   }
@@ -245,6 +244,8 @@ async function generateCodeArtifacts(
   const runtimeConfig = opts?.runtimeConfig ?? (await loadConfig({ cwd: configDir }))?.runtime;
   if (!runtimeConfig) return null;
 
+  writePluginSidebarGen(configDir, runtimeConfig);
+
   const bridge = await syncApiContractBridge({
     configDir,
     runtimeConfig,
@@ -646,92 +647,32 @@ export default createPlugin({
       const version = manifest?.plugin.version ?? pkgJson.version;
 
       if (publishedUrl) {
-        const pluginConfigPath = join(localPath, "bos.config.json");
-        if (existsSync(pluginConfigPath)) {
-          try {
-            const pluginConfig = JSON.parse(readFileSync(pluginConfigPath, "utf-8")) as Record<
-              string,
-              unknown
-            >;
-            if (!pluginConfig.app) pluginConfig.app = {};
-            const app = pluginConfig.app as Record<string, unknown>;
-            if (!app.api) app.api = {};
-            const api = app.api as Record<string, unknown>;
-            api.production = publishedUrl;
-            if (integrity) {
-              api.integrity = integrity;
-            } else {
-              delete api.integrity;
-            }
-            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 = getNetworkIdForAccount(account);
-
-        let pluginDomain: string | undefined;
-        if (existsSync(pluginConfigPath)) {
-          try {
-            const pluginConfig = JSON.parse(readFileSync(pluginConfigPath, "utf-8"));
-            if (typeof pluginConfig.domain === "string") {
-              pluginDomain = pluginConfig.domain;
-            }
-          } catch {}
-        }
-        if (!pluginDomain) {
-          pluginDomain = `${input.key}.${deps.bosConfig.domain ?? "everything.dev"}`;
-        }
-
+        const rootConfigPath = join(deps.configDir, "bos.config.json");
         try {
-          const registryEntries: Record<string, string> = {};
-
-          if (existsSync(pluginConfigPath)) {
-            try {
-              const publishedPluginConfig = JSON.parse(readFileSync(pluginConfigPath, "utf-8"));
-              delete publishedPluginConfig.development;
-              registryEntries[`apps/${account}/${pluginDomain}/bos.config.json`] =
-                JSON.stringify(publishedPluginConfig);
-            } catch {}
+          const rootConfig = JSON.parse(readFileSync(rootConfigPath, "utf-8")) as Record<
+            string,
+            unknown
+          >;
+          if (!rootConfig.plugins || typeof rootConfig.plugins !== "object") {
+            rootConfig.plugins = {};
           }
-
-          if (Object.keys(registryEntries).length > 0) {
-            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;
-
-            await Effect.runPromise(ensureNearCli);
-            try {
-              await Effect.runPromise(
-                executeTransaction({
-                  account,
-                  contract: getRegistryNamespaceForNetwork(network),
-                  method: "__fastdata_kv",
-                  argsBase64,
-                  network,
-                  privateKey,
-                  gas: "50Tgas",
-                  deposit: "0NEAR",
-                }),
-              );
-            } catch (registryError) {
-              const txHash = extractTransactionHash(registryError);
-              if (!txHash) {
-                console.warn(
-                  `[publish] Plugin registry write failed: ${registryError instanceof Error ? registryError.message : registryError}`,
-                );
-              }
-            }
+          const plugins = rootConfig.plugins as Record<string, unknown>;
+          if (!plugins[input.key] || typeof plugins[input.key] !== "object") {
+            plugins[input.key] = {};
           }
-        } catch (registryError) {
-          console.warn(
-            `[publish] Plugin registry write skipped: ${registryError instanceof Error ? registryError.message : registryError}`,
+          const entry = plugins[input.key] as Record<string, unknown>;
+          entry.production = publishedUrl;
+          if (integrity) {
+            entry.integrity = integrity;
+          } else {
+            delete entry.integrity;
+          }
+          writeFileSync(rootConfigPath, `${JSON.stringify(rootConfig, null, 2)}\n`);
+          console.log(`   ✅ Updated bos.config.json: plugins.${input.key}.production`);
+        } catch (err) {
+          console.error(
+            `   ❌ Failed to update bos.config.json:`,
+            err instanceof Error ? err.message : err,
           );
         }
 
@@ -1139,29 +1080,6 @@ export default createPlugin({
         [`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 localPath = join(deps.configDir, pluginRef.development.slice("local:".length));
-        const pluginConfigPath = join(localPath, "bos.config.json");
-        if (!existsSync(pluginConfigPath)) continue;
-
-        try {
-          const pluginConfig = JSON.parse(readFileSync(pluginConfigPath, "utf-8")) as Record<
-            string,
-            unknown
-          >;
-          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 =
@@ -1273,8 +1191,8 @@ export default createPlugin({
     init: builder.init.handler(async ({ input }) => {
       try {
         const timings: PhaseTiming[] = [];
-        let extendsAccount = input.extendsAccount;
-        let extendsGateway = input.extendsGateway;
+        let extendsAccount = "";
+        let extendsGateway = "";
         let directory = input.directory;
         let account = input.account;
         let domain = input.domain;
@@ -1282,10 +1200,13 @@ export default createPlugin({
         let plugins = input.plugins;
 
         if (input.extends) {
-          const match = input.extends.match(/^(?:bos:\/\/)?([^/]+)\/(.+)$/);
+          const normalized = input.extends.startsWith("bos://")
+            ? input.extends
+            : `bos://${input.extends}`;
+          const match = normalized.match(/^bos:\/\/([^/]+)\/(.+)$/);
           if (match) {
-            if (!extendsAccount) extendsAccount = match[1];
-            if (!extendsGateway) extendsGateway = match[2];
+            extendsAccount = match[1];
+            extendsGateway = match[2];
           }
         }
 
@@ -1296,7 +1217,7 @@ export default createPlugin({
         let parentConfig: BosConfig | null = null;
         try {
           parentConfig = await timePhase(timings, "parent config", () =>
-            fetchParentConfig(extendsAccount!, extendsGateway!),
+            fetchParentConfig(extendsAccount, extendsGateway),
           );
           if (parentConfig?.plugins && typeof parentConfig.plugins === "object") {
             parentPluginKeys = Object.keys(parentConfig.plugins);
@@ -1305,9 +1226,7 @@ export default createPlugin({
 
         if (!input.noInteractive) {
           const prompted = await promptInitOptions({
-            extendsAccount,
-            extendsGateway,
-            extends: input.extends,
+            extends: `bos://${extendsAccount}/${extendsGateway}`,
             directory,
             account,
             domain,
@@ -1327,25 +1246,25 @@ export default createPlugin({
         directory = directory || domain || extendsGateway;
         const targetDir = resolve(directory);
         plugins = plugins ?? [];
+        const extendsRef = `bos://${extendsAccount}/${extendsGateway}`;
 
         if (!parentConfig) {
           try {
             parentConfig = await timePhase(timings, "parent config", () =>
-              fetchParentConfig(extendsAccount!, extendsGateway!),
+              fetchParentConfig(extendsAccount, extendsGateway),
             );
           } catch {
             return {
               status: "error" as const,
               directory,
-              extendsAccount,
-              extendsGateway,
+              extendsRef,
               account,
               domain,
-              extends: `bos://${extendsAccount}/${extendsGateway}`,
+              extends: extendsRef,
               plugins: plugins ?? [],
               filesCopied: 0,
               timings,
-              error: `No config found at bos://${extendsAccount}/${extendsGateway} — are you sure this is the right parent?`,
+              error: `No config found at ${extendsRef} — are you sure this is the right parent?`,
             };
           }
         }
@@ -1364,64 +1283,82 @@ export default createPlugin({
 
         parentConfig = resolvedParentConfig;
 
+        const isMinimalScaffold = sourceDir === "";
+
         try {
-          const patterns = await readTemplatekeep(sourceDir);
-          if (patterns.length === 0) {
-            return {
-              status: "error" as const,
-              directory,
-              extendsAccount,
-              extendsGateway,
-              account,
-              domain,
-              extends: `bos://${extendsAccount}/${extendsGateway}`,
-              plugins: plugins ?? [],
-              filesCopied: 0,
-              error: "No .templatekeep found in template source",
-            };
-          }
+          const s = p.spinner();
+          s.start("Setting up project");
 
-          const pluginRoutes: Record<string, string[]> = {};
-          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;
-              }
+          let filesCopied: number;
+
+          if (isMinimalScaffold) {
+            filesCopied = await timePhase(timings, "scaffold project", () =>
+              scaffoldMinimalProject(targetDir, parentConfig as unknown as BosConfigInput, {
+                extendsAccount,
+                extendsGateway,
+                account: account || extendsAccount,
+                domain,
+                plugins,
+                withHost,
+              }),
+            );
+          } else {
+            const patterns = await readTemplatekeep(sourceDir);
+            if (patterns.length === 0) {
+              return {
+                status: "error" as const,
+                directory,
+                extendsRef,
+                account,
+                domain,
+                extends: extendsRef,
+                plugins: plugins ?? [],
+                filesCopied: 0,
+                error: "No .templatekeep found in template source",
+              };
             }
-          }
 
-          const s = p.spinner();
-          s.start("Setting up project");
+            const pluginRoutes: Record<string, string[]> = {};
+            const parentRuntimePlugins = await buildRuntimePluginsForConfig(
+              parentConfig as BosConfig,
+              sourceDir,
+              "production",
+            );
+            for (const [key, plugin] of Object.entries(parentRuntimePlugins ?? {})) {
+              if (plugin.routes && plugin.routes.length > 0) {
+                pluginRoutes[key] = plugin.routes;
+              }
+            }
 
-          const filesCopied = await timePhase(timings, "copy files", () =>
-            copyFilteredFiles(sourceDir, targetDir, patterns, {
-              withHost,
-              plugins,
-              pluginRoutes,
-            }),
-          );
+            filesCopied = await timePhase(timings, "copy files", () =>
+              copyFilteredFiles(sourceDir, targetDir, patterns, {
+                withHost,
+                plugins,
+                pluginRoutes,
+              }),
+            );
 
-          await timePhase(timings, "personalize config", () =>
-            personalizeConfig(targetDir, {
-              extendsAccount,
-              extendsGateway,
-              account: account || extendsAccount,
-              domain: domain || extendsGateway,
-              plugins,
-              pluginRoutes,
-              workspaceOpts: { sourceDir },
-              withHost,
-            }),
-          );
+            await timePhase(timings, "personalize config", () =>
+              personalizeConfig(targetDir, {
+                extendsAccount,
+                extendsGateway,
+                account: account || extendsAccount,
+                domain: domain || extendsGateway,
+                plugins,
+                pluginRoutes,
+                workspaceOpts: { sourceDir },
+                withHost,
+              }),
+            );
 
-          await timePhase(timings, "write snapshot", () =>
-            writeInitSnapshot(targetDir, extendsAccount, extendsGateway, sourceDir, patterns, {
-              withHost,
-              plugins,
-              pluginRoutes,
-            }),
-          );
+            await timePhase(timings, "write snapshot", () =>
+              writeInitSnapshot(targetDir, extendsAccount, extendsGateway, sourceDir, patterns, {
+                withHost,
+                plugins,
+                pluginRoutes,
+              }),
+            );
+          }
 
           const initConfig = await timePhase(timings, "resolve config", () =>
             loadConfig({ cwd: targetDir }),
@@ -1475,11 +1412,10 @@ export default createPlugin({
           return {
             status: "initialized" as const,
             directory,
-            extendsAccount,
-            extendsGateway,
+            extendsRef,
             account,
             domain,
-            extends: `bos://${extendsAccount}/${extendsGateway}`,
+            extends: extendsRef,
             plugins,
             filesCopied,
             timings,
@@ -1488,17 +1424,18 @@ export default createPlugin({
           await cleanup();
         }
       } catch (error) {
+        const extendsRef = input.extends
+          ? input.extends.startsWith("bos://")
+            ? input.extends
+            : `bos://${input.extends}`
+          : "bos://dev.everything.near/everything.dev";
         return {
           status: "error" as const,
           directory: input.directory ?? "",
-          extendsAccount: input.extendsAccount ?? "",
-          extendsGateway: input.extendsGateway ?? "",
+          extendsRef,
           account: input.account,
           domain: input.domain,
-          extends:
-            input.extendsAccount && input.extendsGateway
-              ? `bos://${input.extendsAccount}/${input.extendsGateway}`
-              : "",
+          extends: extendsRef,
           plugins: input.plugins ?? [],
           filesCopied: 0,
           timings: [],

package/src/sidebar.ts

@@ -1,6 +1,6 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
-import type { BosConfig, SidebarItem } from "./types";
+import type { RuntimeConfig, SidebarItem } from "./types";
 
 const ICON_IMPORTS: Record<string, string> = {
   Home: "lucide-react",
@@ -51,11 +51,11 @@ function collectIconImports(items: SidebarItem[]): Map<string, Set<string>> {
   return moduleMap;
 }
 
-export function generatePluginSidebarContent(config: BosConfig, configDir?: string): string {
+export function generatePluginSidebarContent(runtimeConfig: RuntimeConfig): string {
   const coreItems: SidebarItem[] = [{ icon: "Home", label: "home", to: "/", roleRequired: "anon" }];
 
-  if (config.app.auth?.sidebar) {
-    for (const item of config.app.auth.sidebar) {
+  if (runtimeConfig.auth?.sidebar) {
+    for (const item of runtimeConfig.auth.sidebar) {
       coreItems.push({
         ...item,
         to: item.to ?? "/auth",
@@ -65,31 +65,9 @@ export function generatePluginSidebarContent(config: BosConfig, configDir?: stri
   }
 
   const pluginItems: SidebarItem[] = [];
-  if (config.plugins) {
-    for (const [key, entry] of Object.entries(config.plugins)) {
-      let sidebar: SidebarItem[] | undefined;
-
-      if (typeof entry === "object" && entry.sidebar) {
-        sidebar = entry.sidebar;
-      } else if (
-        typeof entry === "object" &&
-        entry.development?.startsWith("local:") &&
-        configDir
-      ) {
-        const localPath = join(configDir, entry.development.slice("local:".length).trim());
-        const pluginConfigPath = join(localPath, "bos.config.json");
-        if (existsSync(pluginConfigPath)) {
-          try {
-            const pluginConfig = JSON.parse(readFileSync(pluginConfigPath, "utf-8")) as {
-              sidebar?: SidebarItem[];
-            };
-            if (pluginConfig.sidebar) {
-              sidebar = pluginConfig.sidebar;
-            }
-          } catch {}
-        }
-      }
-
+  if (runtimeConfig.plugins) {
+    for (const [key, entry] of Object.entries(runtimeConfig.plugins)) {
+      const sidebar = entry.sidebar;
       if (!sidebar) continue;
       for (const item of sidebar) {
         pluginItems.push({
@@ -135,10 +113,10 @@ ${itemsCode}
 `;
 }
 
-export function writePluginSidebarGen(configDir: string, config: BosConfig): string {
+export function writePluginSidebarGen(configDir: string, runtimeConfig: RuntimeConfig): string {
   const outputPath = join(configDir, "ui/src/lib/plugin-sidebar.gen.ts");
 
-  const content = generatePluginSidebarContent(config, configDir);
+  const content = generatePluginSidebarContent(runtimeConfig);
 
   const outputDir = dirname(outputPath);
   if (!existsSync(outputDir)) {

package/src/types.ts

@@ -46,8 +46,9 @@ export const SidebarItemSchema = z.object({
 });
 export type SidebarItem = z.infer<typeof SidebarItemSchema>;
 
-export const ApiPluginConfigSchema = z.object({
-  name: z.string(),
+export const ComposableAppEntrySchema = z.object({
+  extends: ExtendsSchema.optional(),
+  name: z.string().optional(),
   development: z.string().optional(),
   production: z.string().optional(),
   integrity: z.string().optional(),
@@ -55,7 +56,11 @@ export const ApiPluginConfigSchema = z.object({
   variables: z.record(z.string(), z.string()).optional(),
   secrets: z.array(z.string()).optional(),
   sidebar: z.array(SidebarItemSchema).optional(),
+  routes: z.array(z.string()).optional(),
 });
+export type ComposableAppEntry = z.infer<typeof ComposableAppEntrySchema>;
+
+export const ApiPluginConfigSchema = ComposableAppEntrySchema;
 export type ApiPluginConfig = z.infer<typeof ApiPluginConfigSchema>;
 
 export const PluginUiConfigSchema = z.object({
@@ -66,18 +71,8 @@ export const PluginUiConfigSchema = z.object({
 });
 export type PluginUiConfig = z.infer<typeof PluginUiConfigSchema>;
 
-export const BosPluginRefSchema = z.object({
-  extends: ExtendsSchema.optional(),
-  development: z.string().optional(),
-  production: z.string().optional(),
-  integrity: z.string().optional(),
-  name: z.string().optional(),
+export const BosPluginRefSchema = ComposableAppEntrySchema.extend({
   version: z.string().optional(),
-  proxy: z.string().optional(),
-  variables: z.record(z.string(), z.string()).optional(),
-  secrets: z.array(z.string()).optional(),
-  routes: z.array(z.string()).optional(),
-  sidebar: z.array(SidebarItemSchema).optional(),
   app: z.record(z.string(), z.unknown()).optional(),
   shared: z.record(z.string(), z.record(z.string(), SharedConfigSchema)).optional(),
   plugins: z.record(z.string(), z.unknown()).optional(),
@@ -222,8 +217,8 @@ export const BosConfigSchema = z.object({
   app: z.object({
     host: HostConfigSchema,
     ui: UiConfigSchema,
-    api: ApiPluginConfigSchema,
-    auth: ApiPluginConfigSchema.optional(),
+    api: ComposableAppEntrySchema,
+    auth: ComposableAppEntrySchema.optional(),
   }),
 });
 export type BosConfig = z.infer<typeof BosConfigSchema>;