everything-dev 1.8.8 → 1.8.10

package/dist/orchestrator.d.mts

@@ -37,7 +37,7 @@ declare const makeDevProcess: (pkg: string, callbacks: ProcessCallbacks, portOve
   kill: Effect.Effect<void, never, never>;
   waitForReady: Effect.Effect<void, Error, never>;
   waitForExit: Effect.Effect<ExitCode, _$_effect_platform_Error0.PlatformError, never>;
-}, string | Error | _$_effect_platform_Error0.PlatformError, _$effect_Scope0.Scope | ServiceDescriptorMap | DevRuntimeConfig | _$_effect_platform_CommandExecutor0.CommandExecutor>;
+}, string | Error | _$_effect_platform_Error0.PlatformError, ServiceDescriptorMap | DevRuntimeConfig | _$effect_Scope0.Scope | _$_effect_platform_CommandExecutor0.CommandExecutor>;
 declare function getProcessStates(packages: string[], services: Map<string, ServiceDescriptor>, portOverride?: number): ProcessState[];
 //#endregion
 export { ProcessCallbacks, ProcessHandle, ProcessState, ProcessStatus, getProcessStates, makeDevProcess };

package/dist/plugin.d.cts

@@ -27,8 +27,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     interactive: z.ZodOptional<z.ZodBoolean>;
   }, z.core.$strip>, z.ZodObject<{
     status: z.ZodEnum<{
-      started: "started";
       error: "error";
+      started: "started";
     }>;
     description: z.ZodString;
     processes: z.ZodArray<z.ZodString>;
@@ -393,7 +393,7 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     }> | undefined;
   } | null;
   runtimeConfig: {
-    env: "production" | "development";
+    env: "development" | "production";
     account: string;
     networkId: "testnet" | "mainnet";
     host: {

package/dist/plugin.d.mts

@@ -27,8 +27,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     interactive: z.ZodOptional<z.ZodBoolean>;
   }, z.core.$strip>, z.ZodObject<{
     status: z.ZodEnum<{
-      started: "started";
       error: "error";
+      started: "started";
     }>;
     description: z.ZodString;
     processes: z.ZodArray<z.ZodString>;
@@ -393,7 +393,7 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     }> | undefined;
   } | null;
   runtimeConfig: {
-    env: "production" | "development";
+    env: "development" | "production";
     account: string;
     networkId: "testnet" | "mainnet";
     host: {

package/dist/service-descriptor.d.cts

@@ -26,7 +26,7 @@ interface ServiceDescriptor {
 declare const ServiceDescriptorMap_base: Context.TagClass<ServiceDescriptorMap, "ServiceDescriptorMap", Map<string, ServiceDescriptor>>;
 declare class ServiceDescriptorMap extends ServiceDescriptorMap_base {}
 declare const DevRuntimeConfig_base: Context.TagClass<DevRuntimeConfig, "DevRuntimeConfig", {
-  env: "production" | "development";
+  env: "development" | "production";
   account: string;
   networkId: "testnet" | "mainnet";
   host: {

package/dist/service-descriptor.d.mts

@@ -26,7 +26,7 @@ interface ServiceDescriptor {
 declare const ServiceDescriptorMap_base: Context.TagClass<ServiceDescriptorMap, "ServiceDescriptorMap", Map<string, ServiceDescriptor>>;
 declare class ServiceDescriptorMap extends ServiceDescriptorMap_base {}
 declare const DevRuntimeConfig_base: Context.TagClass<DevRuntimeConfig, "DevRuntimeConfig", {
-  env: "production" | "development";
+  env: "development" | "production";
   account: string;
   networkId: "testnet" | "mainnet";
   host: {

package/dist/types.d.cts

@@ -192,8 +192,8 @@ declare const BosConfigSchema: z.ZodObject<{
 type BosConfig = z.infer<typeof BosConfigSchema>;
 declare const RuntimeConfigSchema: z.ZodObject<{
   env: z.ZodEnum<{
-    production: "production";
     development: "development";
+    production: "production";
   }>;
   account: z.ZodString;
   domain: z.ZodOptional<z.ZodString>;
@@ -299,8 +299,8 @@ type RuntimeConfig = z.infer<typeof RuntimeConfigSchema>;
 declare const ClientRuntimeConfigSchema: z.ZodObject<{
   cspNonce: z.ZodOptional<z.ZodString>;
   env: z.ZodEnum<{
-    production: "production";
     development: "development";
+    production: "production";
   }>;
   account: z.ZodString;
   networkId: z.ZodEnum<{

package/dist/types.d.mts

@@ -192,8 +192,8 @@ declare const BosConfigSchema: z.ZodObject<{
 type BosConfig = z.infer<typeof BosConfigSchema>;
 declare const RuntimeConfigSchema: z.ZodObject<{
   env: z.ZodEnum<{
-    production: "production";
     development: "development";
+    production: "production";
   }>;
   account: z.ZodString;
   domain: z.ZodOptional<z.ZodString>;
@@ -299,8 +299,8 @@ type RuntimeConfig = z.infer<typeof RuntimeConfigSchema>;
 declare const ClientRuntimeConfigSchema: z.ZodObject<{
   cspNonce: z.ZodOptional<z.ZodString>;
   env: z.ZodEnum<{
-    production: "production";
     development: "development";
+    production: "production";
   }>;
   account: z.ZodString;
   networkId: z.ZodEnum<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "everything-dev",
-  "version": "1.8.8",
+  "version": "1.8.10",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -156,7 +156,7 @@
     "chalk": "^5.6.2",
     "effect": "^3.21.0",
     "every-plugin": "^2.5.3",
-    "glob": "^11.0.0",
+    "glob": "^13.0.6",
     "gradient-string": "^3.0.0",
     "hono": "^4.7.11",
     "ink": "^6.8.0",

package/src/api-contract.ts

@@ -350,6 +350,12 @@ export async function syncApiContractBridge(opts: {
   }
 
   for (const [key, plugin] of pluginEntries) {
+    if (!plugin.url && !plugin.localPath) {
+      console.warn(
+        `[API Contract] Skipping plugin "${key}" — no URL resolved (local path missing and no production URL configured)`,
+      );
+      continue;
+    }
     const source = await resolveContractSource({
       configDir: opts.configDir,
       runtimeDir,

package/src/cli/init.ts

@@ -24,6 +24,36 @@ import { writeSnapshot } from "./snapshot";
 
 const require = createRequire(import.meta.url);
 
+const BOS_CONFIG_ORDER = [
+  "extends",
+  "account",
+  "domain",
+  "testnet",
+  "staging",
+  "repository",
+  "app",
+  "plugins",
+  "shared",
+];
+
+function rebuildOrderedConfig(config: Record<string, unknown>): Record<string, unknown> {
+  const ordered: Record<string, unknown> = {};
+
+  for (const key of BOS_CONFIG_ORDER) {
+    if (key in config) {
+      ordered[key] = config[key];
+    }
+  }
+
+  for (const key of Object.keys(config)) {
+    if (!BOS_CONFIG_ORDER.includes(key)) {
+      ordered[key] = config[key];
+    }
+  }
+
+  return ordered;
+}
+
 interface SourceResult {
   sourceDir: string;
   parentConfig: BosConfig;
@@ -259,8 +289,10 @@ export async function personalizeConfig(
     plugins?: string[];
     pluginRoutes?: Record<string, string[]>;
     workspaceOpts?: { localOverrides?: boolean; sourceDir?: string };
+    mode?: "init" | "sync";
   },
 ): Promise<void> {
+  const isInit = opts.mode !== "sync";
   const configPath = join(destination, "bos.config.json");
   if (existsSync(configPath)) {
     const config = JSON.parse(readFileSync(configPath, "utf-8")) as Record<string, unknown>;
@@ -274,7 +306,7 @@ export async function personalizeConfig(
       config.domain = opts.domain;
     }
 
-    if (config.app && typeof config.app === "object") {
+    if (isInit && config.app && typeof config.app === "object") {
       const app = config.app as Record<string, unknown>;
       for (const entryKey of Object.keys(app)) {
         const entry = app[entryKey];
@@ -299,21 +331,23 @@ export async function personalizeConfig(
         }
       }
 
-      for (const pluginKey of Object.keys(plugins)) {
-        const plugin = plugins[pluginKey];
-        if (plugin && typeof plugin === "object") {
-          const p = plugin as Record<string, unknown>;
-          delete p.production;
-          delete p.integrity;
+      if (isInit) {
+        for (const pluginKey of Object.keys(plugins)) {
+          const plugin = plugins[pluginKey];
+          if (plugin && typeof plugin === "object") {
+            const p = plugin as Record<string, unknown>;
+            delete p.production;
+            delete p.integrity;
+          }
         }
       }
 
       if (Object.keys(plugins).length === 0) {
-        delete config.plugins;
+        config.plugins = {};
       }
     }
 
-    writeFileSync(configPath, `${JSON.stringify(config, null, 2)}\n`);
+    writeFileSync(configPath, `${JSON.stringify(rebuildOrderedConfig(config), null, 2)}\n`);
   }
 
   const pkgPath = join(destination, "package.json");

package/src/cli/prompts.ts

@@ -16,10 +16,7 @@ function deriveAccountFromDomain(domain: string, extendsAccount: string): string
   return `${firstSegment}.${suffix}`;
 }
 
-const AVAILABLE_PLUGINS = [
-  { value: "_template", label: "template" },
-  { value: "registry", label: "registry" },
-];
+const AVAILABLE_PLUGINS = [{ value: "_template", label: "template" }];
 
 export async function promptInitOptions(input: {
   extendsAccount?: string;

package/src/cli/sync.ts

@@ -74,6 +74,78 @@ function backupFiles(projectDir: string, filePaths: string[]): string | null {
   return backupDir;
 }
 
+function isPlainObject(value: unknown): value is Record<string, unknown> {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+
+function mergeJsonValues(local: unknown, template: unknown): unknown {
+  if (isPlainObject(local) && isPlainObject(template)) {
+    const merged: Record<string, unknown> = {};
+    // Preserve local key order first
+    for (const key of Object.keys(local)) {
+      merged[key] = mergeJsonValues(local[key], template[key]);
+    }
+    // Append any new template keys at the end
+    for (const key of Object.keys(template)) {
+      if (!(key in merged)) {
+        merged[key] = template[key];
+      }
+    }
+    return merged;
+  }
+  // For arrays and primitives, local always wins
+  return local ?? template;
+}
+
+function mergeBosConfig(
+  local: Record<string, unknown>,
+  template: Record<string, unknown>,
+): Record<string, unknown> {
+  const merged: Record<string, unknown> = {};
+
+  // 1. extends always first
+  if (local.extends !== undefined) merged.extends = local.extends;
+  else if (template.extends !== undefined) merged.extends = template.extends;
+
+  // 2. Fixed trailing group: app, plugins, shared
+  const TRAIL_GROUP = ["app", "plugins", "shared"];
+
+  const localKeys = Object.keys(local).filter((k) => k !== "extends");
+  const templateKeys = Object.keys(template).filter(
+    (k) => k !== "extends" && !localKeys.includes(k),
+  );
+
+  // Find the first trailing-group key present locally ("app" comes first in the group)
+  const firstTrailIndex = localKeys.findIndex((k) => TRAIL_GROUP.includes(k));
+
+  const orderedKeys: string[] = [];
+
+  if (firstTrailIndex >= 0) {
+    // Keys before the trail group stay in local order
+    orderedKeys.push(...localKeys.slice(0, firstTrailIndex));
+    // New template keys inserted right before the trail group
+    orderedKeys.push(...templateKeys);
+    // Trail group keys (app, plugins, shared) in canonical order, preserving local if present
+    for (const trailKey of TRAIL_GROUP) {
+      if (localKeys.includes(trailKey)) orderedKeys.push(trailKey);
+    }
+  } else {
+    // No trail group found locally — keep local order then append new keys and trail group
+    orderedKeys.push(...localKeys);
+    orderedKeys.push(...templateKeys);
+    for (const trailKey of TRAIL_GROUP) {
+      if (templateKeys.includes(trailKey)) orderedKeys.push(trailKey);
+    }
+  }
+
+  // 3. Merge values for each key
+  for (const key of orderedKeys) {
+    merged[key] = mergeJsonValues(local[key], template[key]);
+  }
+
+  return merged;
+}
+
 function mergePackageJson(
   local: Record<string, unknown>,
   template: Record<string, unknown>,
@@ -130,6 +202,19 @@ function writeSyncedFile(sourceDir: string, projectDir: string, filePath: string
   const dest = join(projectDir, destPath);
   mkdirSync(dirname(dest), { recursive: true });
 
+  if (filePath.endsWith("bos.config.json")) {
+    const localContent = existsSync(dest) ? readFileSync(dest, "utf-8") : null;
+    const templateContent = readFileSync(src, "utf-8");
+
+    if (localContent) {
+      const local = JSON.parse(localContent) as Record<string, unknown>;
+      const template = JSON.parse(templateContent) as Record<string, unknown>;
+      const merged = mergeBosConfig(local, template);
+      writeFileSync(dest, `${JSON.stringify(merged, null, 2)}\n`);
+      return;
+    }
+  }
+
   if (filePath.endsWith("package.json")) {
     const localContent = existsSync(dest) ? readFileSync(dest, "utf-8") : null;
     const templateContent = readFileSync(src, "utf-8");
@@ -348,6 +433,7 @@ export async function syncTemplate(projectDir: string, options: SyncOptions): Pr
       plugins: childPlugins,
       pluginRoutes,
       workspaceOpts: { sourceDir },
+      mode: "sync",
     });
 
     if (!options.noInstall) {