everything-dev 1.16.2 → 1.17.0

package/src/plugin.ts

@@ -20,6 +20,7 @@ import {
 import { promptInitOptions } from "./cli/prompts";
 import { getStatus } from "./cli/status";
 import { syncTemplate } from "./cli/sync";
+import { timePhase } from "./cli/timing";
 import { upgradeTemplate } from "./cli/upgrade";
 import {
   buildRuntimePluginsForConfig,
@@ -30,8 +31,12 @@ import {
   resolveLocalDevelopmentPath,
   writeResolvedConfig,
 } from "./config";
-import { type BosConfigResult, bosContract, type PluginListResult } from "./contract";
-import { devApp, startApp } from "./dev-session";
+import {
+  type BosConfigResult,
+  bosContract,
+  type PhaseTiming,
+  type PluginListResult,
+} from "./contract";
 import {
   buildRegistryConfigUrl,
   buildRegistryConfigUrlForNetwork,
@@ -58,6 +63,10 @@ import { run } from "./utils/run";
 import { saveBosConfig } from "./utils/save-config";
 import { colors } from "./utils/theme";
 
+async function loadDevSession() {
+  return import("./dev-session");
+}
+
 const buildCommands: Record<string, { cmd: string; args: string[] }> = {
   host: { cmd: "bun", args: ["run", "build"] },
   ui: { cmd: "bun", args: ["run", "build"] },
@@ -227,8 +236,6 @@ async function generateCodeArtifacts(
     runtimeConfig?: RuntimeConfig;
   },
 ): Promise<GeneratedArtifacts | null> {
-  writePluginSidebarGen(configDir, config);
-
   if (opts?.env) {
     writeResolvedConfig(configDir, config, opts.env, opts.extendsChain);
   }
@@ -236,6 +243,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,
@@ -644,18 +653,22 @@ export default createPlugin({
               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 (!pluginConfig.plugins || typeof pluginConfig.plugins !== "object") {
+              pluginConfig.plugins = {};
+            }
+            const plugins = pluginConfig.plugins as Record<string, unknown>;
+            if (!plugins[input.key] || typeof plugins[input.key] !== "object") {
+              plugins[input.key] = {};
+            }
+            const entry = plugins[input.key] as Record<string, unknown>;
+            entry.production = publishedUrl;
             if (integrity) {
-              api.integrity = integrity;
+              entry.integrity = integrity;
             } else {
-              delete api.integrity;
+              delete entry.integrity;
             }
             writeFileSync(pluginConfigPath, `${JSON.stringify(pluginConfig, null, 2)}\n`);
-            console.log(`   ✅ Updated ${pluginConfigPath}: app.api.production`);
+            console.log(`   ✅ Updated ${pluginConfigPath}: plugins.${input.key}.production`);
           } catch (err) {
             console.error(
               `   ❌ Failed to update plugin bos.config.json:`,
@@ -838,6 +851,7 @@ export default createPlugin({
         interactive: input.interactive,
       };
 
+      const { devApp } = await loadDevSession();
       devApp(orchestrator, services, runtimeConfig);
 
       return {
@@ -998,6 +1012,7 @@ export default createPlugin({
         noLogs: true,
       };
 
+      const { startApp } = await loadDevSession();
       startApp(orchestrator, services, runtimeConfig);
       return {
         status: "running" as const,
@@ -1261,6 +1276,7 @@ export default createPlugin({
 
     init: builder.init.handler(async ({ input }) => {
       try {
+        const timings: PhaseTiming[] = [];
         let extendsAccount = input.extendsAccount;
         let extendsGateway = input.extendsGateway;
         let directory = input.directory;
@@ -1283,7 +1299,9 @@ export default createPlugin({
         let parentPluginKeys: string[] = [];
         let parentConfig: BosConfig | null = null;
         try {
-          parentConfig = await fetchParentConfig(extendsAccount, extendsGateway);
+          parentConfig = await timePhase(timings, "parent config", () =>
+            fetchParentConfig(extendsAccount!, extendsGateway!),
+          );
           if (parentConfig?.plugins && typeof parentConfig.plugins === "object") {
             parentPluginKeys = Object.keys(parentConfig.plugins);
           }
@@ -1316,7 +1334,9 @@ export default createPlugin({
 
         if (!parentConfig) {
           try {
-            parentConfig = await fetchParentConfig(extendsAccount, extendsGateway);
+            parentConfig = await timePhase(timings, "parent config", () =>
+              fetchParentConfig(extendsAccount!, extendsGateway!),
+            );
           } catch {
             return {
               status: "error" as const,
@@ -1328,6 +1348,7 @@ export default createPlugin({
               extends: `bos://${extendsAccount}/${extendsGateway}`,
               plugins: plugins ?? [],
               filesCopied: 0,
+              timings,
               error: `No config found at bos://${extendsAccount}/${extendsGateway} — are you sure this is the right parent?`,
             };
           }
@@ -1337,11 +1358,13 @@ export default createPlugin({
           sourceDir,
           parentConfig: resolvedParentConfig,
           cleanup,
-        } = await resolveSourceDir({
-          extendsAccount,
-          extendsGateway,
-          source: input.source,
-        });
+        } = await timePhase(timings, "template source", () =>
+          resolveSourceDir({
+            extendsAccount,
+            extendsGateway,
+            source: input.source,
+          }),
+        );
 
         parentConfig = resolvedParentConfig;
 
@@ -1363,55 +1386,73 @@ export default createPlugin({
           }
 
           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;
-              }
+          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 s = p.spinner();
           s.start("Setting up project");
 
-          const filesCopied = await copyFilteredFiles(sourceDir, targetDir, patterns, {
-            withHost,
-            plugins,
-            pluginRoutes,
-          });
+          const filesCopied = await timePhase(timings, "copy files", () =>
+            copyFilteredFiles(sourceDir, targetDir, patterns, {
+              withHost,
+              plugins,
+              pluginRoutes,
+            }),
+          );
 
-          await 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 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 loadConfig({ cwd: targetDir });
+          const initConfig = await timePhase(timings, "resolve config", () =>
+            loadConfig({ cwd: targetDir }),
+          );
           if (initConfig?.runtime) {
-            writeGeneratedInfra(targetDir, initConfig.runtime);
+            await timePhase(timings, "generate env/docker", async () => {
+              writeGeneratedInfra(targetDir, initConfig.runtime);
+            });
           }
-          ensureEnvFile(targetDir);
+          await timePhase(timings, "create env file", async () => {
+            ensureEnvFile(targetDir);
+          });
 
           if (!input.noInstall) {
-            await runBunInstall(targetDir);
-            await runTypesGen(targetDir);
-            await generateDatabaseMigrations(targetDir);
+            await timePhase(timings, "install dependencies", () => runBunInstall(targetDir));
+            await timePhase(timings, "generate types", () => runTypesGen(targetDir));
+            await timePhase(timings, "generate migrations", () =>
+              generateDatabaseMigrations(targetDir),
+            );
           }
 
-          if (initConfig?.config) {
-            await generateCodeArtifacts(targetDir, initConfig.config);
+          if (input.noInstall && initConfig?.config) {
+            await timePhase(timings, "generate code artifacts", () =>
+              generateCodeArtifacts(targetDir, initConfig.config),
+            );
           }
 
           s.stop("Project initialized");
@@ -1426,7 +1467,7 @@ export default createPlugin({
               const dockerSpinner = p.spinner();
               dockerSpinner.start("Starting Docker services");
               try {
-                await runDockerComposeUp(targetDir);
+                await timePhase(timings, "docker compose up", () => runDockerComposeUp(targetDir));
                 dockerSpinner.stop("Docker services ready");
               } catch (error) {
                 dockerSpinner.stop("Docker services not started");
@@ -1447,6 +1488,7 @@ export default createPlugin({
             extends: `bos://${extendsAccount}/${extendsGateway}`,
             plugins,
             filesCopied,
+            timings,
           };
         } finally {
           await cleanup();
@@ -1465,6 +1507,7 @@ export default createPlugin({
               : "",
           plugins: input.plugins ?? [],
           filesCopied: 0,
+          timings: [],
           error: error instanceof Error ? error.message : "Unknown error",
         };
       }

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>;