everything-dev 1.25.0 → 1.26.1

package/src/cli/init.ts

@@ -378,7 +378,6 @@ export async function personalizeConfig(
     staging?: unknown;
   },
 ): Promise<void> {
-  const isInit = opts.mode !== "sync";
   const has = (section: OverrideSection) => opts.overrides.includes(section);
 
   const configPath = join(destination, "bos.config.json");
@@ -395,20 +394,18 @@ export async function personalizeConfig(
     }
     if (opts.repository) {
       config.repository = opts.repository;
-    } else if (isInit) {
+    } else {
       delete config.repository;
     }
 
-    if (isInit) {
-      const inheritableFields = ["title", "description", "testnet", "staging"] as const;
-      for (const field of inheritableFields) {
-        if (!(field in opts)) {
-          delete config[field];
-        }
+    const inheritableFields = ["title", "description", "testnet", "staging"] as const;
+    for (const field of inheritableFields) {
+      if (!(field in opts)) {
+        delete config[field];
       }
     }
 
-    if (isInit && config.app && typeof config.app === "object") {
+    if (config.app && typeof config.app === "object") {
       const app = config.app as Record<string, unknown>;
 
       for (const entryKey of Object.keys(app)) {
@@ -447,6 +444,7 @@ export async function personalizeConfig(
             plugins[pluginKey] = pluginObj;
           } else if (plugin && typeof plugin === "object") {
             pluginObj = { ...(plugin as Record<string, unknown>) };
+            plugins[pluginKey] = pluginObj;
           } else {
             continue;
           }
@@ -455,7 +453,7 @@ export async function personalizeConfig(
         }
 
         if (Object.keys(plugins).length === 0) {
-          config.plugins = {};
+          delete config.plugins;
         }
       }
     } else {
@@ -475,12 +473,21 @@ export async function personalizeConfig(
         ws.packages = ws.packages.filter((p: string) => {
           if (p.startsWith("packages/")) return false;
           if (p === "host") return has("host");
-          if (p === "plugins/*") return has("plugins") && (opts.plugins?.length ?? 0) > 0;
+          if (p === "plugins/*") return false;
           const pluginMatch = p.match(/^plugins\/([^/]+)/);
           if (pluginMatch)
             return has("plugins") && (opts.plugins?.includes(pluginMatch[1]) ?? true);
           return true;
         });
+
+        if (has("plugins") && (opts.plugins?.length ?? 0) > 0) {
+          for (const plugin of opts.plugins ?? []) {
+            const pluginWorkspace = `plugins/${plugin}`;
+            if (!ws.packages.includes(pluginWorkspace)) {
+              ws.packages.push(pluginWorkspace);
+            }
+          }
+        }
       }
     }
 
@@ -762,6 +769,11 @@ export function stripOrphanedWorkspacesFromLockfile(
   }
 }
 
+export function removeInitLockfile(lockfilePath: string): void {
+  if (!existsSync(lockfilePath)) return;
+  rmSync(lockfilePath, { force: true });
+}
+
 const WORKSPACE_LOCAL_PATHS: Record<string, string> = {
   "everything-dev": "packages/everything-dev",
   "every-plugin": "packages/every-plugin",

package/src/cli/prompts.ts

@@ -89,7 +89,7 @@ export async function promptInitOptions(input: {
   const overrides =
     input.overrides ??
     ((await p.multiselect({
-      message: "Which sections to override locally?",
+      message: "Which sections would you like to customize",
       options: OVERRIDE_OPTIONS,
       initialValues: ["ui", "api"] as OverrideSection[],
       required: false,

package/src/contract.meta.ts

@@ -96,7 +96,7 @@ export const cliCommandMeta = {
         description: "Comma-separated plugin keys to include (requires --overrides=plugins)",
       },
       overrides: {
-        description: "Comma-separated sections to override locally: ui,api,host,plugins",
+        description: "Comma-separated sections to customize locally: ui,api,host,plugins",
       },
       noInteractive: { description: "Skip prompts, use flags only" },
       noInstall: { description: "Skip bun install" },

package/src/plugin.ts

@@ -1,5 +1,6 @@
-import { existsSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, resolve } from "node:path";
+import process from "node:process";
 import * as p from "@clack/prompts";
 import { Effect } from "effect";
 import { syncApiContractBridge } from "./api-contract";
@@ -12,11 +13,13 @@ import {
   generateDatabaseMigrations,
   personalizeConfig,
   readTemplatekeep,
+  removeInitLockfile,
   resolveSourceDir,
   runBunInstall,
   runDockerComposeUp,
   runTypesGen,
   scaffoldMinimalProject,
+  stripOrphanedWorkspacesFromLockfile,
   writeInitSnapshot,
 } from "./cli/init";
 import { promptInitOptions } from "./cli/prompts";
@@ -1234,6 +1237,8 @@ export default createPlugin({
 
         if (!input.noInteractive) {
           s.stop("Config fetched");
+          const initialExtendsAccount = extendsAccount;
+          const initialExtendsGateway = extendsGateway;
           const prompted = await promptInitOptions({
             extends: `bos://${extendsAccount}/${extendsGateway}`,
             directory,
@@ -1250,6 +1255,58 @@ export default createPlugin({
           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" as const,
+                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");
         }
 
@@ -1429,9 +1486,9 @@ export default createPlugin({
           }
 
           const lockfilePath = join(targetDir, "bun.lock");
-          if (existsSync(lockfilePath)) {
-            rmSync(lockfilePath, { force: true });
-          }
+          const allowedWorkspaces = computeAllowedWorkspaces(overrides, plugins);
+          stripOrphanedWorkspacesFromLockfile(lockfilePath, allowedWorkspaces);
+          removeInitLockfile(lockfilePath);
 
           const initConfig = await timePhase(
             timings,
@@ -1747,3 +1804,18 @@ function extractTransactionHash(error: unknown) {
   const match = message.match(/Transaction ID:\s*([A-Za-z0-9]+)/i);
   return match?.[1];
 }
+
+function computeAllowedWorkspaces(overrides: string[], plugins?: string[]): string[] {
+  const workspaces: string[] = [];
+  for (const section of overrides) {
+    if (section === "host") workspaces.push("host");
+    if (section === "ui") workspaces.push("ui");
+    if (section === "api") workspaces.push("api");
+  }
+  if (plugins) {
+    for (const plugin of plugins) {
+      workspaces.push(`plugins/${plugin}`);
+    }
+  }
+  return workspaces;
+}