everything-dev 1.26.0 → 1.27.0

package/src/cli/init.ts

@@ -22,15 +22,32 @@ import {
   normalizePackageManifestsInTree,
 } from "../internal/manifest-normalizer";
 import type { BosConfig, BosConfigInput } from "../types";
-import { isPathExcluded } from "../utils/path-match";
 import { saveBosConfig } from "../utils/save-config";
 import { writeSnapshot } from "./snapshot";
 
 const require = createRequire(import.meta.url);
 
-const FRAMEWORK_PACKAGES = ["every-plugin", "everything-dev"] as const;
+export const INIT_ROOT_PATTERNS = [
+  "bos.config.json",
+  "package.json",
+  ".env.example",
+  ".gitignore",
+  "biome.json",
+  "bunfig.toml",
+  "Dockerfile",
+  "docker-compose.yml",
+  "railway.json",
+  ".agent/**",
+  "AGENTS.md",
+  ".opencode/skills/everything-dev/**",
+  ".changeset/config.json",
+  ".changeset/README.md",
+  "README.md",
+  "CONTRIBUTING.md",
+  ".github/templates/**",
+] as const;
 
-const _DEFAULT_OVERRIDES: OverrideSection[] = ["ui", "api"];
+const FRAMEWORK_PACKAGES = ["every-plugin", "everything-dev"] as const;
 
 const OVERRIDE_WORKSPACE_MAP: Record<OverrideSection, string[]> = {
   ui: ["ui"],
@@ -84,25 +101,28 @@ export async function resolveSourceDir(opts: {
   };
 }
 
-export async function readTemplatekeep(sourceDir: string): Promise<string[]> {
-  const keepFile = join(sourceDir, ".templatekeep");
-  if (!existsSync(keepFile)) {
-    return [];
-  }
-
-  const content = readFileSync(keepFile, "utf-8");
-  const patterns = content
-    .split("\n")
-    .map((line) => line.trim())
-    .filter((line) => line.length > 0 && !line.startsWith("#"));
-
-  if (!patterns.includes(".templatekeep")) {
-    patterns.unshift(".templatekeep");
+export function buildInitPatterns(overrides: OverrideSection[], plugins?: string[]): string[] {
+  const has = (section: OverrideSection) => overrides.includes(section);
+  const patterns: string[] = [...INIT_ROOT_PATTERNS];
+
+  if (has("ui")) patterns.push("ui/**");
+  if (has("api")) patterns.push("api/**");
+  if (has("host")) patterns.push("host/**");
+  if (has("plugins")) {
+    for (const plugin of plugins ?? []) {
+      patterns.push(`plugins/${plugin}/**`);
+    }
   }
 
   return patterns;
 }
 
+export function sourcePathToDestinationPath(filePath: string): string {
+  return filePath.startsWith(".github/templates/")
+    ? filePath.replace(/^\.github\/templates\//, ".github/")
+    : filePath;
+}
+
 export async function fetchParentConfig(
   extendsAccount: string,
   extendsGateway: string,
@@ -235,102 +255,33 @@ function parseGitHubUrl(url: string): { owner: string; repo: string; branch: str
   return null;
 }
 
-function filterPatternsByOverrides(
-  patterns: string[],
-  overrides: OverrideSection[],
-  _plugins?: string[],
-): string[] {
-  const has = (section: OverrideSection) => overrides.includes(section);
-  let filtered = [...patterns];
-
-  if (!has("host")) {
-    filtered = filtered.filter((p) => !p.startsWith("host/") && p !== "host/**");
-  }
-  if (!has("ui")) {
-    filtered = filtered.filter((p) => !p.startsWith("ui/") && p !== "ui/**");
-  }
-  if (!has("api")) {
-    filtered = filtered.filter((p) => !p.startsWith("api/") && p !== "api/**");
-  }
-  if (!has("plugins")) {
-    filtered = filtered.filter((p) => !p.startsWith("plugins/") && p !== "plugins/**");
-  }
-
-  return filtered;
-}
-
 export async function copyFilteredFiles(
   sourceDir: string,
   destination: string,
   patterns: string[],
-  options: {
+  _options: {
     overrides: OverrideSection[];
     plugins?: string[];
-    pluginRoutes?: Record<string, string[]>;
   },
 ): Promise<number> {
   if (patterns.length === 0) {
     return 0;
   }
 
-  const has = (section: OverrideSection) => options.overrides.includes(section);
-
-  const effectivePatterns = filterPatternsByOverrides(patterns, options.overrides, options.plugins);
-
-  if (has("host") && !effectivePatterns.some((p) => p.startsWith("host/") || p === "host/**")) {
-    effectivePatterns.push("host/**");
-  }
-
-  const excludedRoutePatterns: string[] = [];
-  if (options.pluginRoutes) {
-    for (const [pluginKey, routePatterns] of Object.entries(options.pluginRoutes)) {
-      if (!(options.plugins?.includes(pluginKey) ?? true)) {
-        excludedRoutePatterns.push(...routePatterns);
-      }
-    }
-  }
-
   const allFiles = new Set<string>();
-  for (const pattern of effectivePatterns) {
+  for (const pattern of patterns) {
     const matches = await glob(pattern, {
       cwd: sourceDir,
       nodir: true,
       dot: true,
       absolute: false,
+      ignore: ["**/node_modules/**", "**/.git/**", "**/dist/**", "**/.bos/**"],
     });
     for (const match of matches) {
-      const pluginMatch = match.match(/^plugins\/([^/]+)/);
-      if (pluginMatch) {
-        const pluginName = pluginMatch[1];
-        if (!(options.plugins?.includes(pluginName) ?? true)) continue;
-      }
-      if (isPathExcluded(match, excludedRoutePatterns)) continue;
       allFiles.add(match);
     }
   }
 
-  const routeFiles = new Set<string>();
-  if (options.pluginRoutes) {
-    for (const [pluginKey, routePatterns] of Object.entries(options.pluginRoutes)) {
-      if (!(options.plugins?.includes(pluginKey) ?? true)) continue;
-      for (const rp of routePatterns) {
-        const matches = await glob(rp, {
-          cwd: sourceDir,
-          nodir: true,
-          dot: true,
-          absolute: false,
-        });
-        for (const match of matches) {
-          if (!isPathExcluded(match, excludedRoutePatterns)) {
-            routeFiles.add(match);
-          }
-        }
-      }
-    }
-  }
-
-  for (const f of routeFiles) allFiles.add(f);
-
   mkdirSync(destination, { recursive: true });
 
   let count = 0;
@@ -339,9 +290,7 @@ export async function copyFilteredFiles(
     const stat = lstatSync(src);
     if (!stat.isFile()) continue;
 
-    const destPath = filePath.startsWith(".github/templates/")
-      ? filePath.replace(/^\.github\/templates\//, ".github/")
-      : filePath;
+    const destPath = sourcePathToDestinationPath(filePath);
     const dest = join(destination, destPath);
     mkdirSync(dirname(dest), { recursive: true });
     const content = readFileSync(src);
@@ -493,34 +442,38 @@ export async function personalizeConfig(
 
     if (pkg.scripts && typeof pkg.scripts === "object") {
       const scripts = pkg.scripts as Record<string, string>;
-      const rewrite = (key: string, from: string, to: string) => {
-        if (scripts[key]?.includes(from)) {
-          scripts[key] = scripts[key].replaceAll(from, to);
+      const FROM = "bun packages/everything-dev/src/cli.ts";
+      const TO = "node_modules/.bin/bos";
+      const rewrite = (key: string) => {
+        if (scripts[key]?.includes(FROM)) {
+          scripts[key] = scripts[key].replaceAll(FROM, TO);
         }
       };
-      rewrite("dev", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
-      rewrite("dev:ui", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
-      rewrite("dev:api", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
-      rewrite("dev:proxy", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
-      rewrite("build", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
-      rewrite("deploy", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
-      rewrite("publish", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
-      rewrite("start", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
-
+      rewrite("dev");
+      rewrite("dev:ui");
+      rewrite("dev:api");
+      rewrite("dev:proxy");
+      rewrite("build");
+      rewrite("deploy");
+      rewrite("publish");
+      rewrite("start");
+      rewrite("bos");
       scripts.postinstall = "node_modules/.bin/bos types gen || true";
       scripts["types:gen"] = "node_modules/.bin/bos types gen";
       if (scripts.typecheck) {
         scripts.typecheck = scripts.typecheck
           .replace("bun run types:gen && ", "")
           .replace(/bun run --cwd packages\/everything-dev typecheck & ?/, "");
+        if (!has("ui")) {
+          scripts.typecheck = scripts.typecheck.replace(/bun run --cwd ui tsc --noEmit & ?/, "");
+        }
+        if (!has("api")) {
+          scripts.typecheck = scripts.typecheck.replace(/bun run --cwd api tsc --noEmit & ?/, "");
+        }
         if (!has("host")) {
           scripts.typecheck = scripts.typecheck.replace(/bun run --cwd host tsc --noEmit & ?/, "");
         }
       }
-
-      if (!scripts.bos) {
-        scripts.bos = "node_modules/.bin/bos";
-      }
     }
 
     if (pkg.devDependencies && typeof pkg.devDependencies === "object") {
@@ -683,20 +636,44 @@ export async function runBunInstallForUpgrade(
   destination: string,
   spinner?: { message: (msg: string) => void },
 ): Promise<void> {
-  await runWithProgress("bun", ["install"], destination, spinner, "Installing dependencies");
+  await runWithProgress(
+    "bun",
+    ["install", "--force"],
+    destination,
+    spinner,
+    "Installing dependencies",
+  );
 }
 
 export async function runTypesGen(
   destination: string,
   spinner?: { message: (msg: string) => void },
 ): Promise<void> {
-  await runWithProgress(
-    "node_modules/.bin/bos",
-    ["types", "gen"],
-    destination,
-    spinner,
-    "Generating types",
-  );
+  const localBosBin = join(destination, "node_modules", ".bin", "bos");
+  if (existsSync(localBosBin)) {
+    await runWithProgress(
+      "node_modules/.bin/bos",
+      ["types", "gen"],
+      destination,
+      spinner,
+      "Generating types",
+    );
+    return;
+  }
+
+  const localCli = join(destination, "packages", "everything-dev", "src", "cli.ts");
+  if (existsSync(localCli)) {
+    await runWithProgress(
+      "bun",
+      ["run", "--cwd", "packages/everything-dev", "src/cli.ts", "types", "gen"],
+      destination,
+      spinner,
+      "Generating types",
+    );
+    return;
+  }
+
+  throw new Error("Unable to locate bos CLI for types generation");
 }
 
 export async function runDockerComposeUp(destination: string): Promise<void> {
@@ -763,65 +740,82 @@ 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",
 };
 
+function readJsonFile<T>(filePath: string): T {
+  return JSON.parse(readFileSync(filePath, "utf-8")) as T;
+}
+
+function tryResolvePackageJson(packageName: string): string | null {
+  try {
+    return require.resolve(`${packageName}/package.json`);
+  } catch {
+    return null;
+  }
+}
+
 function resolveFrameworkCatalog(): Record<string, string> {
   const catalog: Record<string, string> = {};
+  const everythingDevPackageJson = tryResolvePackageJson("everything-dev");
 
-  try {
-    const selfPkgPath = require.resolve("everything-dev/package.json");
-    const selfPkgDir = dirname(selfPkgPath);
-    const monorepoPkgPath = join(selfPkgDir, "..", "..", "package.json");
-    if (existsSync(monorepoPkgPath)) {
-      const monorepoPkg = JSON.parse(readFileSync(monorepoPkgPath, "utf-8")) as {
+  if (everythingDevPackageJson) {
+    try {
+      const selfPkgDir = dirname(everythingDevPackageJson);
+      const monorepoPkgPath = join(selfPkgDir, "..", "..", "package.json");
+      if (existsSync(monorepoPkgPath)) {
+        const monorepoPkg = readJsonFile<{
+          workspaces?: { catalog?: Record<string, string> };
+        }>(monorepoPkgPath);
+        const sourceCatalog = monorepoPkg.workspaces?.catalog;
+        if (sourceCatalog && typeof sourceCatalog === "object") {
+          for (const [name, version] of Object.entries(sourceCatalog)) {
+            if (typeof version === "string") {
+              catalog[name] = version;
+            }
+          }
+        }
+      }
+    } catch {}
+
+    try {
+      const selfPkg = readJsonFile<{
+        version?: string;
         workspaces?: { catalog?: Record<string, string> };
-      };
-      const sourceCatalog = monorepoPkg.workspaces?.catalog;
+      }>(everythingDevPackageJson);
+      if (selfPkg.version && !catalog["everything-dev"]) {
+        catalog["everything-dev"] = `^${selfPkg.version}`;
+      }
+      const sourceCatalog = selfPkg.workspaces?.catalog;
       if (sourceCatalog && typeof sourceCatalog === "object") {
         for (const [name, version] of Object.entries(sourceCatalog)) {
-          if (typeof version === "string") {
+          if (typeof version === "string" && !catalog[name]) {
             catalog[name] = version;
           }
         }
       }
-    }
-  } catch {}
-
-  try {
-    const selfPkgPath = require.resolve("everything-dev/package.json");
-    const selfPkg = JSON.parse(readFileSync(selfPkgPath, "utf-8")) as {
-      version?: string;
-      workspaces?: { catalog?: Record<string, string> };
-    };
-    if (selfPkg.version && !catalog["everything-dev"]) {
-      catalog["everything-dev"] = `^${selfPkg.version}`;
-    }
-    const sourceCatalog = selfPkg.workspaces?.catalog;
-    if (sourceCatalog && typeof sourceCatalog === "object") {
-      for (const [name, version] of Object.entries(sourceCatalog)) {
-        if (typeof version === "string" && !catalog[name]) {
-          catalog[name] = version;
-        }
-      }
-    }
-  } catch {}
-
-  if (Object.keys(catalog).length > 0) {
-    return catalog;
+    } catch {}
   }
 
   for (const packageName of FRAMEWORK_PACKAGES) {
+    const resolved = tryResolvePackageJson(packageName);
+    if (!resolved) continue;
+
     try {
-      const resolved = require.resolve(`${packageName}/package.json`);
-      const pkg = JSON.parse(readFileSync(resolved, "utf-8")) as { version?: string };
+      const pkg = readJsonFile<{ version?: string }>(resolved);
       if (pkg.version) {
         catalog[packageName] = `^${pkg.version}`;
       }
     } catch {}
   }
+
   return catalog;
 }
 
@@ -1001,72 +995,32 @@ export async function writeInitSnapshot(
   extendsGateway: string,
   sourceDir: string,
   patterns: string[],
-  options: {
+  _options: {
     overrides: OverrideSection[];
     plugins?: string[];
-    pluginRoutes?: Record<string, string[]>;
   },
 ): Promise<void> {
-  const effectivePatterns = filterPatternsByOverrides(patterns, options.overrides, options.plugins);
-
-  const has = (section: OverrideSection) => options.overrides.includes(section);
-  if (has("host") && !effectivePatterns.some((p) => p.startsWith("host/") || p === "host/**")) {
-    effectivePatterns.push("host/**");
-  }
-
-  const excludedRoutePatterns: string[] = [];
-  if (options.pluginRoutes) {
-    for (const [pluginKey, routePatterns] of Object.entries(options.pluginRoutes)) {
-      if (!(options.plugins?.includes(pluginKey) ?? true)) {
-        excludedRoutePatterns.push(...routePatterns);
-      }
-    }
-  }
-
   const allFiles = new Set<string>();
-  for (const pattern of effectivePatterns) {
+  for (const pattern of patterns) {
     const matches = await glob(pattern, {
       cwd: sourceDir,
       nodir: true,
       dot: true,
       absolute: false,
+      ignore: ["**/node_modules/**", "**/.git/**", "**/dist/**", "**/.bos/**"],
     });
     for (const match of matches) {
-      const pluginMatch = match.match(/^plugins\/([^/]+)/);
-      if (pluginMatch && !(options.plugins?.includes(pluginMatch[1]) ?? true)) continue;
-      if (isPathExcluded(match, excludedRoutePatterns)) continue;
       allFiles.add(match);
     }
   }
 
-  if (options.pluginRoutes) {
-    for (const [pluginKey, routePatterns] of Object.entries(options.pluginRoutes)) {
-      if (!(options.plugins?.includes(pluginKey) ?? true)) continue;
-      for (const rp of routePatterns) {
-        const matches = await glob(rp, {
-          cwd: sourceDir,
-          nodir: true,
-          dot: true,
-          absolute: false,
-        });
-        for (const match of matches) {
-          if (!isPathExcluded(match, excludedRoutePatterns)) {
-            allFiles.add(match);
-          }
-        }
-      }
-    }
-  }
-
   const fileHashes: Record<string, string> = {};
   for (const filePath of allFiles) {
     const src = join(sourceDir, filePath);
     const stat = lstatSync(src);
     if (!stat.isFile()) continue;
     const content = readFileSync(src);
-    const destPath = filePath.startsWith(".github/templates/")
-      ? filePath.replace(/^\.github\/templates\//, ".github/")
-      : filePath;
+    const destPath = sourcePathToDestinationPath(filePath);
     fileHashes[destPath] = computeHash(content);
   }
 

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: "What do you want to customize?",
       options: OVERRIDE_OPTIONS,
       initialValues: ["ui", "api"] as OverrideSection[],
       required: false,