everything-dev 1.16.2 → 1.16.3

package/src/cli/upgrade.ts

@@ -3,12 +3,13 @@ import { join } from "node:path";
 import process from "node:process";
 import * as p from "@clack/prompts";
 import { glob } from "glob";
-import type { UpgradeOptions, UpgradeResult } from "../contract";
+import type { PhaseTiming, UpgradeOptions, UpgradeResult } from "../contract";
 import { resolveExtendsRef } from "../merge";
 import { saveBosConfig } from "../utils/save-config";
 import { readInstalledFrameworkVersion } from "./framework-version";
 import { fetchParentConfig, runBunInstall, runTypesGen } from "./init";
 import { syncTemplate } from "./sync";
+import { timePhase } from "./timing";
 
 const FRAMEWORK_PACKAGES = ["everything-dev", "every-plugin"];
 
@@ -333,38 +334,52 @@ export async function upgradeTemplate(
   projectDir: string,
   options: UpgradeOptions,
 ): Promise<UpgradeResult> {
+  const timings: PhaseTiming[] = [];
   const pkgPath = join(projectDir, "package.json");
   if (!existsSync(pkgPath)) {
     return {
       status: "error",
       packages: [],
+      timings,
       error: "No package.json found in current directory",
     };
   }
 
-  const packages: UpgradeResult["packages"] = [];
+  const { packages, catalogVersionUpdates } = await timePhase(
+    timings,
+    "check package versions",
+    async () => {
+      const nextPackages: UpgradeResult["packages"] = [];
 
-  for (const name of FRAMEWORK_PACKAGES) {
-    const installed = readInstalledVersion(projectDir, name);
-    const latest = await fetchLatestNpmVersion(name);
+      for (const name of FRAMEWORK_PACKAGES) {
+        const installed = readInstalledVersion(projectDir, name);
+        const latest = await fetchLatestNpmVersion(name);
 
-    if (!latest) {
-      packages.push({ name, from: installed, to: installed ?? "unknown" });
-      continue;
-    }
+        if (!latest) {
+          nextPackages.push({ name, from: installed, to: installed ?? "unknown" });
+          continue;
+        }
 
-    packages.push({ name, from: installed, to: latest });
-  }
+        nextPackages.push({ name, from: installed, to: latest });
+      }
 
-  const catalogVersionUpdates: Array<{ name: string; from: string | undefined; to: string }> = [];
-  for (const name of CATALOG_TOOL_PACKAGES) {
-    const installed = readInstalledVersion(projectDir, name);
-    if (!installed) continue;
-    const latest = await fetchLatestNpmVersion(name);
-    if (!latest) continue;
-    if (installed === latest) continue;
-    catalogVersionUpdates.push({ name, from: installed, to: latest });
-  }
+      const nextCatalogVersionUpdates: Array<{
+        name: string;
+        from: string | undefined;
+        to: string;
+      }> = [];
+      for (const name of CATALOG_TOOL_PACKAGES) {
+        const installed = readInstalledVersion(projectDir, name);
+        if (!installed) continue;
+        const latest = await fetchLatestNpmVersion(name);
+        if (!latest) continue;
+        if (installed === latest) continue;
+        nextCatalogVersionUpdates.push({ name, from: installed, to: latest });
+      }
+
+      return { packages: nextPackages, catalogVersionUpdates: nextCatalogVersionUpdates };
+    },
+  );
 
   const hasFrameworkUpdates = packages.some((p) => p.from !== p.to && p.from !== undefined);
   const hasCatalogUpdates = catalogVersionUpdates.length > 0;
@@ -372,7 +387,11 @@ export async function upgradeTemplate(
 
   if (options.dryRun) {
     let changelogUrl: string | undefined;
-    const pluginOptions = options.noSync ? null : await loadParentPluginOptions(projectDir);
+    const pluginOptions = options.noSync
+      ? null
+      : await timePhase(timings, "discover parent plugins", () =>
+          loadParentPluginOptions(projectDir),
+        );
     if (hasUpdates) {
       const configPath = join(projectDir, "bos.config.json");
       let parentConfig: Record<string, unknown> | null = null;
@@ -394,59 +413,68 @@ export async function upgradeTemplate(
         ...catalogVersionUpdates.map((u) => ({ name: u.name, from: u.from, to: u.to })),
       ],
       availablePlugins: pluginOptions?.newPluginKeys,
+      timings,
       changelogUrl,
     };
   }
 
-  for (const pkg of packages) {
-    if (pkg.from !== undefined && pkg.from !== pkg.to) {
-      updateRootPackageVersion(projectDir, pkg.name, pkg.to);
-    }
-  }
-
-  for (const update of catalogVersionUpdates) {
-    updateRootCatalogVersion(projectDir, update.name, update.to);
-  }
-
-  const workspacePkgPaths = await findWorkspacePackageJsons(projectDir);
-  for (const pkgPath of workspacePkgPaths) {
+  await timePhase(timings, "apply package updates", async () => {
     for (const pkg of packages) {
       if (pkg.from !== undefined && pkg.from !== pkg.to) {
-        updateWorkspacePackageRefInFile(pkgPath, pkg.name);
+        updateRootPackageVersion(projectDir, pkg.name, pkg.to);
       }
     }
+
     for (const update of catalogVersionUpdates) {
-      updateWorkspacePackageRefInFile(pkgPath, update.name);
+      updateRootCatalogVersion(projectDir, update.name, update.to);
     }
-  }
+
+    const workspacePkgPaths = await findWorkspacePackageJsons(projectDir);
+    for (const pkgPath of workspacePkgPaths) {
+      for (const pkg of packages) {
+        if (pkg.from !== undefined && pkg.from !== pkg.to) {
+          updateWorkspacePackageRefInFile(pkgPath, pkg.name);
+        }
+      }
+      for (const update of catalogVersionUpdates) {
+        updateWorkspacePackageRefInFile(pkgPath, update.name);
+      }
+    }
+  });
 
   let syncResult: UpgradeResult["sync"];
   let addedPlugins: string[] = [];
   if (!options.noSync) {
-    if (!options.dryRun) {
-      addedPlugins = await addSelectedParentPlugins(projectDir);
-    }
-
-    syncResult = await syncTemplate(projectDir, {
-      dryRun: false,
-      force: options.force,
-      noInstall: true,
+    addedPlugins = await timePhase(timings, "discover parent plugins", async () => {
+      if (options.dryRun) return [];
+      return addSelectedParentPlugins(projectDir);
     });
+
+    syncResult = await timePhase(timings, "sync template", () =>
+      syncTemplate(projectDir, {
+        dryRun: false,
+        force: options.force,
+        noInstall: true,
+      }),
+    );
   }
 
   if ((hasUpdates || addedPlugins.length > 0) && !options.noInstall) {
-    await runBunInstall(projectDir);
-    await runTypesGen(projectDir);
+    await timePhase(timings, "install dependencies", () => runBunInstall(projectDir));
+    await timePhase(timings, "generate types", () => runTypesGen(projectDir));
   }
 
-  const migratedFiles = await rewriteLegacyUiImports(projectDir);
-  for (const file of OBSOLETE_FILES) {
-    const filePath = join(projectDir, file);
-    if (existsSync(filePath)) {
-      rmSync(filePath);
-      migratedFiles.push(file);
+  const migratedFiles = await timePhase(timings, "clean obsolete files", async () => {
+    const nextMigratedFiles = await rewriteLegacyUiImports(projectDir);
+    for (const file of OBSOLETE_FILES) {
+      const filePath = join(projectDir, file);
+      if (existsSync(filePath)) {
+        rmSync(filePath);
+        nextMigratedFiles.push(file);
+      }
     }
-  }
+    return nextMigratedFiles;
+  });
 
   let changelogUrl: string | undefined;
   const mainPkg = packages.find((p) => p.name === "everything-dev");
@@ -470,6 +498,7 @@ export async function upgradeTemplate(
     sync: syncResult,
     migrated: migratedFiles.length > 0 ? migratedFiles : undefined,
     selectedPlugins: addedPlugins.length > 0 ? addedPlugins : undefined,
+    timings,
     changelogUrl,
   };
 }

package/src/cli.ts

@@ -2,6 +2,7 @@
 import { findCommandDescriptor } from "./cli/catalog";
 import { printHelp } from "./cli/help";
 import { parseCommandInput } from "./cli/parse";
+import { formatDuration, sumPhaseDurations } from "./cli/timing";
 import { findConfigPath } from "./config";
 import bosPlugin from "./plugin";
 import { createPluginRuntime } from "./sdk";
@@ -50,6 +51,18 @@ function normalizeVersion(v: string): string {
   return v.replace(/^[\^~>=v]+/, "").trim();
 }
 
+function printTimingSummary(timings: Array<{ name: string; durationMs: number }> | undefined) {
+  if (!timings || timings.length === 0) return;
+
+  console.log(`  ${colors.dim("Timings:")}`);
+  for (const timing of timings) {
+    console.log(`    ${colors.dim(timing.name.padEnd(22))} ${formatDuration(timing.durationMs)}`);
+  }
+  console.log(
+    `    ${colors.dim("total".padEnd(22))} ${formatDuration(sumPhaseDurations(timings))}`,
+  );
+}
+
 async function warnIfOutdated(client: any, command: string): Promise<void> {
   if (!["dev", "build", "start"].includes(command)) return;
 
@@ -152,6 +165,7 @@ async function main() {
       if (result.plugins && result.plugins.length > 0)
         console.log(`  ${colors.dim("Plugins:")} ${result.plugins.join(", ")}`);
       console.log(`  ${colors.dim("Files copied:")} ${result.filesCopied}`);
+      printTimingSummary(result.timings);
       console.log();
       console.log(colors.dim("  Next steps:"));
       console.log(colors.dim(`    cd ${result.directory}`));
@@ -246,6 +260,7 @@ async function main() {
       if (result.selectedPlugins && result.selectedPlugins.length > 0) {
         console.log(`  ${colors.dim("Added plugins:")} ${result.selectedPlugins.join(", ")}`);
       }
+      printTimingSummary(result.timings);
       if (result.sync) {
         const sync = result.sync;
         if (sync.updated.length > 0) {

package/src/contract.ts

@@ -156,6 +156,11 @@ export const InitOptionsSchema = z.object({
   noInstall: z.boolean().default(false),
 });
 
+export const PhaseTimingSchema = z.object({
+  name: z.string(),
+  durationMs: z.number(),
+});
+
 export const InitResultSchema = z.object({
   status: z.enum(["initialized", "error"]),
   directory: z.string(),
@@ -166,6 +171,7 @@ export const InitResultSchema = z.object({
   extends: z.string(),
   plugins: z.array(z.string()).optional(),
   filesCopied: z.number(),
+  timings: z.array(PhaseTimingSchema).optional(),
   error: z.string().optional(),
 });
 
@@ -203,6 +209,7 @@ export const UpgradeResultSchema = z.object({
   migrated: z.array(z.string()).optional(),
   availablePlugins: z.array(z.string()).optional(),
   selectedPlugins: z.array(z.string()).optional(),
+  timings: z.array(PhaseTimingSchema).optional(),
   changelogUrl: z.string().optional(),
   error: z.string().optional(),
 });
@@ -307,6 +314,7 @@ export type KeyPublishOptions = z.infer<typeof KeyPublishOptionsSchema>;
 export type KeyPublishResult = z.infer<typeof KeyPublishResultSchema>;
 export type InitOptions = z.infer<typeof InitOptionsSchema>;
 export type InitResult = z.infer<typeof InitResultSchema>;
+export type PhaseTiming = z.infer<typeof PhaseTimingSchema>;
 export type SyncOptions = z.infer<typeof SyncOptionsSchema>;
 export type SyncResult = z.infer<typeof SyncResultSchema>;
 export type UpgradeOptions = z.infer<typeof UpgradeOptionsSchema>;

package/src/dev-session.ts

@@ -1,4 +1,4 @@
-import { NodeContext } from "@effect/platform-node";
+import * as NodeContext from "@effect/platform-node/NodeContext";
 import { Deferred, Effect, Exit } from "effect";
 import {
   type DevViewHandle,

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"] },
@@ -838,6 +847,7 @@ export default createPlugin({
         interactive: input.interactive,
       };
 
+      const { devApp } = await loadDevSession();
       devApp(orchestrator, services, runtimeConfig);
 
       return {
@@ -998,6 +1008,7 @@ export default createPlugin({
         noLogs: true,
       };
 
+      const { startApp } = await loadDevSession();
       startApp(orchestrator, services, runtimeConfig);
       return {
         status: "running" as const,
@@ -1261,6 +1272,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 +1295,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 +1330,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 +1344,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 +1354,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;
 
@@ -1375,43 +1394,59 @@ export default createPlugin({
           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 +1461,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 +1482,7 @@ export default createPlugin({
             extends: `bos://${extendsAccount}/${extendsGateway}`,
             plugins,
             filesCopied,
+            timings,
           };
         } finally {
           await cleanup();
@@ -1465,6 +1501,7 @@ export default createPlugin({
               : "",
           plugins: input.plugins ?? [],
           filesCopied: 0,
+          timings: [],
           error: error instanceof Error ? error.message : "Unknown error",
         };
       }